From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPMKK-00021E-GK for qemu-devel@nongnu.org; Tue, 19 Jul 2016 00:08:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPMKI-0002mQ-Iv for qemu-devel@nongnu.org; Tue, 19 Jul 2016 00:08:11 -0400 From: Eric Blake Date: Mon, 18 Jul 2016 22:07:48 -0600 Message-Id: <1468901281-22858-2-git-send-email-eblake@redhat.com> In-Reply-To: <1468901281-22858-1-git-send-email-eblake@redhat.com> References: <1468901281-22858-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v5 01/14] nbd: Fix bad flag detection on server List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, pbonzini@redhat.com 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 --- v4: new patch --- nbd/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nbd/server.c b/nbd/server.c index 29e2099..3c1e2b3 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; -- 2.5.5