From nobody Sun May 19 07:16:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586194237; cv=none; d=zohomail.com; s=zohoarc; b=aLh8Pp09gvp/Iw4lCXcfAMkh4aLkc4rHGaGZGJZnR1eqvYCx5P8PZINwvkcETTI42KIZOpvsvny9PQGQk98RLeNCA3gnwukjiv5P+bbPXrX5vIYK9y3b5u0ZxocAg40Juusgw6GfOJf1Zeuf0qLPNCAn9MRw+3CAaNUWepK2u6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586194237; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=S009quL0ozlC4s2Uet0N3GSvwIW/DZDIb5nr0DA2C00=; b=N7yUAlhMXAykv2zJL+10nIlZiht4ovnHpxlW7L6i8pooEOoWTPS4BB/w8+uU9oAeVQywlMa6tUpG1UCPDBThqfsAyfvfUQYyV2q15XXICbMoqQozQlD0tgxycQ1KepcnlbwtjgzvkTO1vAjUNBnY9+HY5BRMmw3FVCIPTFkNbzA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586194237904990.878626799448; Mon, 6 Apr 2020 10:30:37 -0700 (PDT) Received: from localhost ([::1]:35610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVa0-000235-4G for importer@patchew.org; Mon, 06 Apr 2020 13:30:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60265) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVYw-0001P8-DU for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:29:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVYv-0008Dr-1x for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:29:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:58750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLVYu-00084q-RS for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:29:29 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 660EFB1D7B for ; Mon, 6 Apr 2020 17:29:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Andreas Schwab To: qemu-devel@nongnu.org Subject: [PATCH] linux-user: Use getcwd syscall directly X-Yow: Are you still SEXUALLY ACTIVE? Did you BRING th' REINFORCEMENTS? Date: Mon, 06 Apr 2020 17:18:19 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.90 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The glibc getcwd function returns different errors than the getcwd syscall, which triggers an assertion failure in the glibc getcwd function when running under the emulation. Signed-off-by: Andreas Schwab --- linux-user/syscall.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 83c2891169..90c5433fec 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -375,14 +375,7 @@ static bitmask_transtbl fcntl_flags_tbl[] =3D { { 0, 0, 0, 0 } }; =20 -static int sys_getcwd1(char *buf, size_t size) -{ - if (getcwd(buf, size) =3D=3D NULL) { - /* getcwd() sets errno */ - return (-1); - } - return strlen(buf)+1; -} +_syscall2(int, sys_getcwd1, char *, buf, size_t, size) =20 #ifdef TARGET_NR_utimensat #if defined(__NR_utimensat) --=20 2.26.0 --=20 Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint =3D 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."