From: Eric Blake <eblake@redhat.com>
Date: Thu, 21 Jul 2016 19:34:45 +0000 (-0600)
Subject: nbd: Fix bad flag detection on server
X-Git-Tag: qemu-xen-4.8.0-rc1~63^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5bee0f4717c4c67394aaade0c5a9cee3d42cc614;p=qemu-xen.git

nbd: Fix bad flag detection on server

Commit ab7c548e added a check for invalid flags, but used an
early return on error instead of properly going through the
cleanup label.

Signed-off-by: Eric Blake <eblake@redhat.com>

Message-Id: <1469129688-22848-2-git-send-email-eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/nbd/server.c b/nbd/server.c
index 29e2099b5e..3c1e2b336b 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1057,7 +1057,8 @@ static ssize_t nbd_co_receive_request(NBDRequest *req,
     if (request->type & ~NBD_CMD_MASK_COMMAND & ~NBD_CMD_FLAG_FUA) {
         LOG("unsupported flags (got 0x%x)",
             request->type & ~NBD_CMD_MASK_COMMAND);
-        return -EINVAL;
+        rc = -EINVAL;
+        goto out;
     }
 
     rc = 0;