From patchwork Tue Jul 12 12:02:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9225221 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B29960572 for ; Tue, 12 Jul 2016 12:36:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFE2F27BFF for ; Tue, 12 Jul 2016 12:36:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4D1627EED; Tue, 12 Jul 2016 12:36:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 790EB27CCB for ; Tue, 12 Jul 2016 12:36:41 +0000 (UTC) Received: from localhost ([::1]:40105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwvY-0004ro-Ic for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 08:36:40 -0400 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 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bMwOM-0007W1-54; Tue, 12 Jul 2016 13:02:22 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 13:02:15 +0100 Message-Id: <1468324939-12221-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468324939-12221-1-git-send-email-peter.maydell@linaro.org> References: <1468324939-12221-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 4/8] linux-user: Fix error handling in flatload.c target_pread() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Riku Voipio , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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; }