From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Michael Roth Date: Thu, 8 Jan 2015 11:34:22 -0600 Message-Id: <1420738472-23267-79-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH 78/88] block/raw-posix: Fix ret in raw_open_common() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@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; } -- 1.9.1