From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwjd-0007rm-W4 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMwjd-0007zc-3C for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:24:21 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:58258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwjc-0007yc-TT for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:24:21 -0400 From: Peter Maydell Date: Tue, 12 Jul 2016 13:02:15 +0100 Message-Id: <1468324939-12221-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1468324939-12221-1-git-send-email-peter.maydell@linaro.org> References: <1468324939-12221-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 4/8] linux-user: Fix error handling in flatload.c target_pread() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio , Paolo Bonzini The flatload.c target_pread() function is supposed to return 0 on success or negative host errnos; however it wasn't checking lock_user() for failure or returning the errno from the pread() call. Fix these problems (the first of which is noted by Coverity). Signed-off-by: Peter Maydell --- linux-user/flatload.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 48ad1c5..99492d3 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -95,7 +95,13 @@ static int target_pread(int fd, abi_ulong ptr, abi_ulong len, int ret; buf = lock_user(VERIFY_WRITE, ptr, len, 0); + if (!buf) { + return -EFAULT; + } ret = pread(fd, buf, len, offset); + if (ret < 0) { + ret = -errno; + } unlock_user(buf, ptr, len); return ret; } -- 1.9.1