From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 26 Nov 2012 14:19:31 +0000 (+0100)
Subject: nbd: fix use of two uninitialized bytes when connecting to a named export
X-Git-Tag: v1.3.0-rc2~14^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ffaaba0e939f2a284bb23d1f6f7f9e2104a97e2;p=thirdparty%2Fqemu.git

nbd: fix use of two uninitialized bytes when connecting to a named export

Reported-by: Michal Privoznik <mprivoznik@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/nbd.c b/nbd.c
index 97a5914e0f3..01976e8e339 100644
--- a/nbd.c
+++ b/nbd.c
@@ -397,6 +397,7 @@ static int nbd_send_negotiate(NBDClient *client)
     rc = -EINVAL;
 
     TRACE("Beginning negotiation.");
+    memset(buf, 0, sizeof(buf));
     memcpy(buf, "NBDMAGIC", 8);
     if (client->exp) {
         assert ((client->exp->nbdflags & ~65535) == 0);
@@ -406,7 +407,6 @@ static int nbd_send_negotiate(NBDClient *client)
     } else {
         cpu_to_be64w((uint64_t*)(buf + 8), NBD_OPTS_MAGIC);
     }
-    memset(buf + 28, 0, 124);
 
     if (client->exp) {
         if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {