2018-07-05 23:54:02 +02:00
|
|
|
From 7c5f7f5e8249a4294254168bb50507589203a5e6 Mon Sep 17 00:00:00 2001
|
2018-05-25 20:04:13 +02:00
|
|
|
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
|
|
Date: Fri, 27 Apr 2018 17:20:01 +0300
|
|
|
|
|
Subject: [PATCH] nbd/client: fix nbd_negotiate_simple_meta_context
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
Bug 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>
|
|
|
|
|
Message-Id: <20180427142002.21930-2-vsementsov@virtuozzo.com>
|
|
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
|
|
CC: qemu-stable@nongnu.org
|
|
|
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
|
|
(cherry picked from commit 89aa0d87634e2cb98517509dc8bdb876f26ecf8b)
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 +
|
