From patchwork Thu Jan 8 17:34:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 426788 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 38636140140 for ; Fri, 9 Jan 2015 05:10:00 +1100 (AEDT) Received: from localhost ([::1]:47418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9HWw-00088X-95 for incoming@patchwork.ozlabs.org; Thu, 08 Jan 2015 13:09:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H0a-0005DP-Gb for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9H07-0006yx-SW for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:32 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:46800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H07-0006yY-L4 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:03 -0500 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 10:36:03 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Jan 2015 10:36:00 -0700 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id DD81D3E4003F; Thu, 8 Jan 2015 10:35:59 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t08HaF7A41746548; Thu, 8 Jan 2015 10:36:15 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t08HZwQY001937; Thu, 8 Jan 2015 10:35:58 -0700 Received: from localhost (morrigu.austin.ibm.com [9.41.105.45]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t08HZvJt001876; Thu, 8 Jan 2015 10:35:57 -0700 From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 8 Jan 2015 11:34:22 -0600 Message-Id: <1420738472-23267-79-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15010817-0005-0000-0000-000007DE70A5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.150 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 78/88] block/raw-posix: Fix ret in raw_open_common() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Max Reitz The return value must be negative on error; there is one place in raw_open_common() where errp is set, but ret remains 0. Fix it. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 01212d4ed68fc8daa29062a9a38650cf8febe392) Signed-off-by: Michael Roth --- block/raw-posix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index 2d51f26..efa5686 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -447,6 +447,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, s->has_write_zeroes = true; if (fstat(s->fd, &st) < 0) { + ret = -errno; error_setg_errno(errp, errno, "Could not stat file"); goto fail; }