[Qemu-devel] [PATCH 1/2] nbd/client: fix nbd_negotiate_simple_meta_context

Vladimir Sementsov-Ogievskiy posted 2 patches 7 years, 6 months ago
[Qemu-devel] [PATCH 1/2] nbd/client: fix nbd_negotiate_simple_meta_context
Posted by Vladimir Sementsov-Ogievskiy 7 years, 6 months ago
Initialize received variable. Otherwise, is is possible for server to
answer without any contexts, but we will set context_id to something
random (received_id is not initialized too) and return 1, which is
wrong.

To solve it, just initialize received to false. Initialize received_id
too, just to make all possible checkers happy.

But was introduced in 78a33ab58782efdb206de14 "nbd: BLOCK_STATUS for
standard get_block_status function: client part" with the whole
function.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 nbd/client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nbd/client.c b/nbd/client.c
index b9e175d1c2..7f35b5c323 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -613,8 +613,8 @@ static int nbd_negotiate_simple_meta_context(QIOChannel *ioc,
 {
     int ret;
     NBDOptionReply reply;
-    uint32_t received_id;
-    bool received;
+    uint32_t received_id = 0;
+    bool received = false;
     uint32_t export_len = strlen(export);
     uint32_t context_len = strlen(context);
     uint32_t data_len = sizeof(export_len) + export_len +
-- 
2.11.1


Re: [Qemu-devel] [PATCH 1/2] nbd/client: fix nbd_negotiate_simple_meta_context
Posted by Eric Blake 7 years, 6 months ago
On 04/27/2018 09:20 AM, Vladimir Sementsov-Ogievskiy wrote:
> Initialize received variable. Otherwise, is is possible for server to
> answer without any contexts, but we will set context_id to something
> random (received_id is not initialized too) and return 1, which is
> wrong.
> 
> To solve it, just initialize received to false. Initialize received_id
> too, just to make all possible checkers happy.
> 
> But was introduced in 78a33ab58782efdb206de14 "nbd: BLOCK_STATUS for

s/But/Bug/

> standard get_block_status function: client part" with the whole
> function.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  nbd/client.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org