From patchwork Tue Mar 13 17:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 885387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 4013Hv5tnPz9sSl for ; Wed, 14 Mar 2018 05:27:54 +1100 (AEDT) Received: from localhost ([::1]:41890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoeN-000525-UX for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2018 14:27:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoV-0008OV-Sj for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoV-0007kE-4T for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:15 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:48495) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoU-0007io-RJ; Tue, 13 Mar 2018 13:34:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MKdiF-1exjDe2En1-001wmV; Tue, 13 Mar 2018 18:34:05 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:44 +0100 Message-Id: <20180313173355.4468-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:WOzwx4y2ioOFJU5G1S9bQGiTmCms3n0AL5iNOnBga4vUQuWchY7 ziQ7qS9TuHSfpLRRdMEImdkcqrVDGqmme6pcoP4qFwX/Gg5ZN2VMO6lxgz4ZFdUzL0Hqkdx kkGRLecanmuIns9M+zLzhcdwalRvgWKZ+jjrkYj77m2Dxx5XmoIDIHZzjh7gnMAh1eCMFfk 3ZueljfR38h6rTO/YnPUg== X-UI-Out-Filterresults: notjunk:1; V01:K0:6Qi/+g+1f3g=:sgdjIAgsUxj3jxalPQPJyN f5Amjf3YgTdsBpgzrfchknin9tDTsGSR841NnuSS6kgC6BtPD2N4oypmbLJkjZlAQTp6BfQ7p AlX0nts5YhhNSRmMbllB4NBwZCIL4VJPLFIT9dw64YaalxqLB0ILovV5Oc6t0XlSPlxrOH5lO reHVL5yjkaceqn6pp0J48G2I0XaURd32eqX21jtojqa4RUwMuTwyNESllmbvlHAZgf01O3dIC txfM+S1Uf/wYnJD8vqAG+BOogzTf8U0ck621M6KLrZ3tjHoGB3t/UXy4xlocfvijxrPkpwlHj S0/tuMxNgEsx2ziiGz1MU+YNA0dbm5Y0JQq6e+pN+E9CMthGXTarLCYJd/JtZj9hIq4C5RomM uv+KFx9EEJRki7JiIOsKrUiEJ0HGQjo6pt8lH1zVW5xCfKA3jJQINezBMH9ja1Un3rhaNzsuB 8xW5OmjicWzt8/n0u+BSMhvrqBctNUob30TmQq0mPV98wudu5IvMR2UUPTgrY6caZvK/ODFv6 9H71Sqhu4AJHGwBnZSvKYat8ndbQcAk6nbLHa2EtxevmgCapCRrVwjCaqHOQHDWrUYYRIBiNL Iq2/pmWygVaSJmrSVoUv60MVfti/d9dO3Qx6zfiHA5aUYbqp5VTMBfJ9U02uVb66pjTRW6TZU q8+HNaZytW9LXp+NKYE2LByZuyrBAvz+5ryexf4vvSrGnVtvDUTCGfXtA8NKds24To01FnTs/ Iyn0bBVMRsgSzdLKf7oKEv8SXH76Kw4f+YFBOQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 07/18] linux-user: fix target_mprotect/target_munmap error return values 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: Max Filippov , Riku Voipio , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Max Filippov target_mprotect/target_munmap return value goes through get_errno at the call site, thus the functions must either set errno to host error code and return -1 or return negative guest error code. Do the latter. Cc: qemu-stable@nongnu.org Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180228221609.11265-8-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index df81f9b803..84b15c9a16 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -77,11 +77,11 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) #endif if ((start & ~TARGET_PAGE_MASK) != 0) - return -EINVAL; + return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); end = start + len; if (!guest_range_valid(start, len)) { - return -ENOMEM; + return -TARGET_ENOMEM; } prot &= PROT_READ | PROT_WRITE | PROT_EXEC; if (len == 0) @@ -621,10 +621,10 @@ int target_munmap(abi_ulong start, abi_ulong len) start, len); #endif if (start & ~TARGET_PAGE_MASK) - return -EINVAL; + return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); if (len == 0 || !guest_range_valid(start, len)) { - return -EINVAL; + return -TARGET_EINVAL; } mmap_lock();