From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUfXl-0006iZ-91 for qemu-devel@nongnu.org; Tue, 02 Aug 2016 15:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUfXj-0003b1-9A for qemu-devel@nongnu.org; Tue, 02 Aug 2016 15:40:01 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUfXj-0003ae-20 for qemu-devel@nongnu.org; Tue, 02 Aug 2016 15:39:59 -0400 Received: by mail-wm0-x244.google.com with SMTP id o80so32557253wme.0 for ; Tue, 02 Aug 2016 12:39:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 2 Aug 2016 21:39:25 +0200 Message-Id: <1470166775-3671-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1470166775-3671-1-git-send-email-pbonzini@redhat.com> References: <1470166775-3671-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 15/25] nbd: Fix bad flag detection on server List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Blake 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 Message-Id: <1469129688-22848-2-git-send-email-eblake@redhat.com> Signed-off-by: Paolo Bonzini --- 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.7.4