From patchwork Tue Aug 1 23:27:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1815692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=deller@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=ae2GvHY+; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RFrsY276Kz1yYC for ; Wed, 2 Aug 2023 09:29:05 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQymU-0001K6-7P; Tue, 01 Aug 2023 19:27:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qQymS-0001Im-8C for qemu-devel@nongnu.org; Tue, 01 Aug 2023 19:27:56 -0400 Received: from mout.gmx.net ([212.227.17.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qQymP-00077u-0T for qemu-devel@nongnu.org; Tue, 01 Aug 2023 19:27:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690932467; x=1691537267; i=deller@gmx.de; bh=N0Dlhp9SfJjPZs7/6Px6gA2M4iFsr6qxZXp6AFGyc34=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ae2GvHY+wc+d5DW1xyLJfYeC4bMWpFF4zpZCDuY1L6e57LY80RFSpvdA2uu3l1p9MxxO0cL Ke3p0a7DgI2u7nmQ27/O8ilv32Z9xoDRt6UodpDX4prWDficF2GKsEacJwzNxpCaWTrJFaZz7 4LSsa3fgua12L1lSphZqIeQWk/NJdUUr8GD+Mql9Geql6RCxMTt2WnwdwcRyxz63xIy7SXQr1 F7U/y5B+fcNgs2NWqQPC9BOMbOpXIi5spkXLxrwQT9FXyNjE65wSjtVXUZbRf7Mkof1KmUFtK RJlY/HmVLFeolsFXDDqsuKI22b18wOqi9XrzwR0uWb8+o3OnDQ4Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from p100.fritz.box ([94.134.150.247]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5mGB-1plPrs1Emh-0179wv; Wed, 02 Aug 2023 01:27:47 +0200 From: Helge Deller To: qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier , Paolo Bonzini , Joel Stanley , Akihiko Odaki , Helge Deller Subject: [PATCH v6 2/8] linux-user: Do not call get_errno() in do_brk() Date: Wed, 2 Aug 2023 01:27:39 +0200 Message-ID: <20230801232745.4125-3-deller@gmx.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801232745.4125-1-deller@gmx.de> References: <20230801232745.4125-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:TmUFxzVccsPk1UUJ2K+MD5sAUSAzgEXo8tLUBGR2FYcGWfFhPK9 giW/X8ohG8VXEZQzMSTwK/VQpbdX+uwZ9FBLBTGwfdGPgnWeWbJ+LIpM6zclNDCIB0X30rK fnPy8ywWu6U34YTTN0oulZoWtIiemJ8Yibw1Yb+RJ8C99tvbhWBFD9FPYZafkA4MsgVJOBa ZXtFRjbCCB1n7c9ULFuKA== UI-OutboundReport: notjunk:1;M01:P0:2CFNa0EdhMA=;rp4y4vDVstcfqiOUZoWJFcA9N/I gqBJzdtpRtk5cDCCJQxVlIx3kPgslCixFWPCx1E7OtjhKJTd3NLRiGnDRQCN6KlVU2YWeyMvK skyYMKLfdfnpdjQ/bT7IwNjY8Q5G6m5fIbOD2SflvD54k1F9dXUkwGPAxSQc4z4FmBSmeVXax Z4LRrlwXCLYQkMWxkfRS5rw/jMAoooyPW4uYnaebjrX8Syrz4B1+VPt1Q/FSWwIkLnwLkBMv8 aNq2unxHda9HPc5qv4mjythJ7gCIJkBzvNZod7I79yWoSMvPDz6hIXiy6ZM6mrwepi33ey56G fFP0An5Wzgeohdv1T0ukyg1eD0yIcz5bo642iBWDQwZBgqf4sAhpJLpuxINPqG0yeExS9Q65J rRooX3/k5SAuCcCGDEFm60hhXbeg70myo8QSVx4iP0ol1m75qhDxqcSHlZjQUGtFeJJANhNtA gkUO41cg+sQ48L1BJm+ypPzFJTFwGPY4lblnvWSQzELB7hXHrSxH7XKlAniOaQFUb46YivXsa BnuiDz7SUF8y0/0g2439JnYWVj8BRluVPZsfdl06i1+xpT1ty+DVGUfV0d+UnpmeZ+r+JC0qo JG1O/rHz/rGLKADfhcTbTiF1qLm3PJQOpUIXIUMVOpVMKjQ8utuIt+BUREJXFknKkBxKHyrc+ 47vTafTIDOGFGDdt8KVRBOA1qpled2bNZbVEeDpT2mVLeAq/JZ0oj592+kGQbJwWDmRrYxa+b AEk816+FttGxnq0rfHNkqX/yAEobFCROs+zE8hfzOljNPABcXqANk0uyPUpSoAR+z5MFvbG3P aLLjSkIbQpsG3dz8GS3s/Jx+ovYII+GIn0dt4Gz5VqhN3CPS9LjXA8fnGXDiP/lyAYqZJvzya IxAKjvYaEmm4GbUUVbZ6ijZi3sTYyB/XVuT/poTO3YwzchpKzl1fZMWeyqF7c+CEj4bnDeFLf gCGOnuGwVG0r7yaxncT5vdPLqOQ= Received-SPF: pass client-ip=212.227.17.22; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: Akihiko Odaki Later the returned value is compared with -1, and negated errno is not expected. Fixes: 00faf08c95 ("linux-user: Don't use MAP_FIXED in do_brk()") Signed-off-by: Akihiko Odaki Reviewed-by: Helge Deller Signed-off-by: Helge Deller --- linux-user/syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.41.0 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 95727a816a..b9d2ec02f9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -862,9 +862,9 @@ abi_long do_brk(abi_ulong brk_val) */ if (new_host_brk_page > brk_page) { new_alloc_size = new_host_brk_page - brk_page; - mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size, - PROT_READ|PROT_WRITE, - MAP_ANON|MAP_PRIVATE, 0, 0)); + mapped_addr = target_mmap(brk_page, new_alloc_size, + PROT_READ|PROT_WRITE, + MAP_ANON|MAP_PRIVATE, 0, 0); } else { new_alloc_size = 0; mapped_addr = brk_page;