From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2056.outbound.protection.outlook.com [40.107.21.56]) by sourceware.org (Postfix) with ESMTPS id 8FF97385C416 for ; Fri, 30 Sep 2022 15:09:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8FF97385C416 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=V/ZwvO1DE2PP07Kdpj4KnrroPvL7VHJKXIAkKMD53IDUrMSY264suWfZVh0FPn0g8YD0npBKfEgwbV7e1LGXmrUSl+PvtYlWeSG/a9OQ24szb6DZcljFNlfRWiOKbk2a8iq2rscegG/9Ro0v07mbbn2BL58mvHsUyC2s7/AAceW9Cz/3NyJrfY0qQXJEoZOPvGcyDAcLxqIEeeq/vh2dc2WlpWik2H5aUY0F9dsDcB9umwr2Q3DF4LN/BoJYbBLZXnF2/j8DL92PF/SsUyq8HK5LqtGnfcyEUe1xzyLDQHquE/2Uz23HYBGw4cnfB0UPC6QnnqUU32TjGkKBBVZF9g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8M4ibc+TgtHU08MdUquZKiTgdT4TLznIsggmmcgSD9E=; b=ILv6CpPKN5WIxL1INYweaF5CiZKrJOLWnWuQ3PhyJnSvkuHUhfeZhQ31xQ9AArcxyobQ07BdifAuHAGeVWpz8bfc2bkdge/U+eFlgeLi8so1+59NcqREuUdlqZlx9xkkKSySjj7vvKALlE7dnnl61GW6MlunBTApbfrL2ByRABWXL9gk9hKN9pKdYbAXk/8gT6g2sT/fxGuRS3kjUq7IGDIadDR4zCo0dhckuM2oqTvlpUV06BjnpYk3gv0tM8xnEepOTPyjk/uDcxvJv4zY0qQX6TdOSA/zdYSTEXwAfUytOz13glkNK2H/eAm3cI3hbgZqJAYEpkciFUgkHtNaJQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8M4ibc+TgtHU08MdUquZKiTgdT4TLznIsggmmcgSD9E=; b=fvT97oRo1Z1jFiO5OuoLrg60G2c73qph9PBUNRcH/K+SZn6z1qlUyNRBR6hCwbKXTR+Cc1VjYbQ31aHBmgEA4kqF6J2qBigg6NzTBMvqQgOWlgV6jYXZFeu3vZt1BFDVedXxSvAnWNUMrIWX1UFcXKv2X84uOayvvLk6cDoGh2A= Received: from DB6PR0501CA0004.eurprd05.prod.outlook.com (2603:10a6:4:8f::14) by DU0PR08MB7462.eurprd08.prod.outlook.com (2603:10a6:10:355::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Fri, 30 Sep 2022 15:09:35 +0000 Received: from DBAEUR03FT021.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:8f:cafe::c8) by DB6PR0501CA0004.outlook.office365.com (2603:10a6:4:8f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23 via Frontend Transport; Fri, 30 Sep 2022 15:09:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT021.mail.protection.outlook.com (100.127.142.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17 via Frontend Transport; Fri, 30 Sep 2022 15:09:35 +0000 Received: ("Tessian outbound 937eed45f6ed:v128"); Fri, 30 Sep 2022 15:09:35 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8380bc39d118c5c9 X-CR-MTA-TID: 64aa7808 Received: from 820b13387cf3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4A2F8750-EC13-47A0-86AA-C0D4C4002C45.1; Fri, 30 Sep 2022 15:09:28 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 820b13387cf3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 30 Sep 2022 15:09:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ipKQ2y/zfzTxe4C9Yylq/5lxSp86kae/OnoECcInCDzAdFtql8aF2Ty90P7Z4POu1ISbrXhfN13WPK89MDtvELXbjZTQsSiNk7NxyhI0f3mZ4aBNoq0MajNgIbMUqlx9UjQzDew99571zZIUhwK/zCuLQ0f8f4KD21k69iuEJcI+OPts8vuYbcvIC/RQG+Cv20HOfwJKeofsXKLai2EE5lzSV1feEFMXtx85eSaPK7jDeu8HAW5NCFC4jUVL6O/enjKf0P1LgT+ZOKbnU0nrw1hW93YVvVcdWuelkCokMMxO8+HUrnSXfasQNunpqs29TG2meDvSuqtQe2WTiFgRzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8M4ibc+TgtHU08MdUquZKiTgdT4TLznIsggmmcgSD9E=; b=XuHOZCPiXdjVrKk27zpmo7Grp8kp5LC3IECHJOHfLZ/+TBNkCyCLvM8RNb3tiQ3t//ogwIpj6zipRaqfQrJp3b5OrS3Qfc69zcB0qmMpjBMaEutwomirFMTx83YOsLJyvGTzyhzCOSn8NjUapynoimhNrgCfE7fISyo9e61hrt/Wd746D85+b4cPtMDcyUxMAhSwcx7P68XlXmrXpP7zk9ZhBBJFNEvxx4+BpG87VuZvAyoCs1wjJ6ZLHBm2iJfZaAvQvU5V7c9YLSB78q9C707gYmPVgGYSMX6tbIZbzvFwTl+gbEngEZ7PLyrfcfOcDAwftBz5HpC/w+vIj+Bncw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8M4ibc+TgtHU08MdUquZKiTgdT4TLznIsggmmcgSD9E=; b=fvT97oRo1Z1jFiO5OuoLrg60G2c73qph9PBUNRcH/K+SZn6z1qlUyNRBR6hCwbKXTR+Cc1VjYbQ31aHBmgEA4kqF6J2qBigg6NzTBMvqQgOWlgV6jYXZFeu3vZt1BFDVedXxSvAnWNUMrIWX1UFcXKv2X84uOayvvLk6cDoGh2A= Received: from AS4PR08MB7901.eurprd08.prod.outlook.com (2603:10a6:20b:51c::16) by AS2PR08MB9198.eurprd08.prod.outlook.com (2603:10a6:20b:579::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.19; Fri, 30 Sep 2022 15:09:27 +0000 Received: from AS4PR08MB7901.eurprd08.prod.outlook.com ([fe80::4d64:ef01:4d4c:6ba1]) by AS4PR08MB7901.eurprd08.prod.outlook.com ([fe80::4d64:ef01:4d4c:6ba1%8]) with mapi id 15.20.5676.017; Fri, 30 Sep 2022 15:09:27 +0000 From: Wilco Dijkstra To: Adhemerval Zanella , "libc-alpha@sourceware.org" , Yu Chien Peter Lin Subject: Re: [PATCH v3 2/2] malloc: Do not clobber errno on __getrandom_nocancel (BZ #29624) Thread-Topic: [PATCH v3 2/2] malloc: Do not clobber errno on __getrandom_nocancel (BZ #29624) Thread-Index: AQHY1DmbuL+akzNhC0aaf8cT0Ll9uq34FHsO Date: Fri, 30 Sep 2022 15:09:27 +0000 Message-ID: References: <20220929192756.3310704-1-adhemerval.zanella@linaro.org> <20220929192756.3310704-2-adhemerval.zanella@linaro.org> In-Reply-To: <20220929192756.3310704-2-adhemerval.zanella@linaro.org> Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: AS4PR08MB7901:EE_|AS2PR08MB9198:EE_|DBAEUR03FT021:EE_|DU0PR08MB7462:EE_ X-MS-Office365-Filtering-Correlation-Id: 1447161c-ceaa-48e8-44f0-08daa2f5c985 x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 67CG/5EHM6IA7XatTe9Iva/hu9UbV9bJsxokUhunIzhssM0Uh8/ToXS8rP2Su4DEfcIWPUSbBGOfdZeZvbQjV178Q4W/5Wu0Sb0wCq5CggMSQJE+8o6InxiImr/Ge+SY5HURpYt/Y1w3R5svR/OqP/wN3IygP4AUtfNRH5LynmCRQdMrzQmwYGhGtWX675V+gEFXr0lvk2hYFexNwk6cElpz4RwVYy9bAG94Dbphp/0Or26Zd6+m2NVc1UzUvABtGVUbj/l1RoJWezvOHjPirfQseMVGx3RsW6RvXXE5HIXCpdTFEyOrC1nWXdIzI4QZFhShCVlfVwEjukrIpXD6w4sDa6Kq0rQ7jGYyzIoRh4rGNnQqL7e4SEwnTV/ccbDUVspzeRmYBn0ln1F0afZ4MMbPgVEAbf+hSb5XelQYzdP+Z+O3gyxEzGWv+PFs0VIPx5ThZJS/pLdQ1ojWsKSxooGGx53FA0F7QYBqgtlrm6faDF4OrXHZxIgpLK4XPestPRkw1XBAymgBolGWeZ6+Nvk5eRhXlTErnPKiOWnXQEPOiaJ5KIZCLk4i9lrzBq2cj2iuzE0toxxEW19HZT8F9xSGxfaLZaUrN8zR+C6W62JuEsfkiL4Ps4n8ZNVW2ATmMwqR2x/nL0N/yKI7gguiwJ1rSINVf4x4sHbngl9K7jfUbbBiFLYwX7HLgyDd7bCo8nTrxhwkIYAe8sVt5Kv1TVUTK2pjDhr/R8o3B5Db1l+Sa8YM0S204m5OtJ78m3Gg/RPJW6gAvqOY0+igB9ZHDQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR08MB7901.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(366004)(376002)(396003)(136003)(39860400002)(346002)(451199015)(6506007)(8676002)(7696005)(478600001)(9686003)(71200400001)(83380400001)(110136005)(26005)(186003)(2906002)(55016003)(5660300002)(66556008)(8936002)(316002)(41300700001)(66446008)(64756008)(91956017)(76116006)(52536014)(66476007)(66946007)(122000001)(38100700002)(86362001)(38070700005)(33656002);DIR:OUT;SFP:1101; Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9198 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 528fbc91-60b4-4116-7eaa-08daa2f5c49a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 36q+wCK19k9bbGJc2d1uFBntsqNuNTco1nhK5P9mTQu23VTrei1ZwAmweomDZf5uc8rd87SW4xRXn9rMhxDW/RdIyPTz82UFOLSLULbWBemQp0co75s7K2KyWJI8/GUSqVBhO1p7YED6ZQMlnYZEo6p2SBtt3GkyAjUqmlqeWJm6OJL1UaTyw1MV2aaK6uOgUCj9Q36HHqSJ+lMV5qbQQXmOUpN1fDHbFOSDyr8C3dXMDBh3hQrxHGuPqS8FWoJtuv9lGRdAFewIWX5PO2kKWF2dvE0u9ubhJcxov9sXbPIY2CRY5PWRMFREv6y13CbZVuCgRJbxwbmnqzdd60JjW0mEMd5BOZfrng7TWX/qOcwTz77J04UAt/7FqtaMSRg7E3DH8VNRaqFz0FQ4vaxqa3KHybp6Jj8LJa7rNgyJfII8c8RSVSNVn5OLw7PRVdhPGhUtkZDMb/bJwDNPfireiWgFHD/PH3/4nxyNRw2M0j4gvJ225ajWTSnSQkarHb+bG30vLlSSawevfP4siq2hArRKI08KauszBOUyETVy0m/C9Ivxg5w30Dh6kGScPYji5Uoiv73lAjWNTVc/UJOe+tS0byVCGphFHAxD4qguGHuf4kjzrged/m2g2ctTDVbI3s44zzVu4EglsKcRFgk/jJ7D6viAWTTEpq2vOTz1URcgMTVjEVhJkjaYzI9EgJE6IFtlprqRq09dH3J4KMJZO+NXIiPk8FylYmBtqOhTgZe/DxM5Nf+2GEHdZrpuKUnaFLnJU5pWfexNvNlj1m3FqQ== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199015)(46966006)(40470700004)(36840700001)(6506007)(70586007)(9686003)(26005)(8936002)(82740400003)(47076005)(41300700001)(52536014)(7696005)(83380400001)(5660300002)(40460700003)(36860700001)(186003)(81166007)(33656002)(2906002)(82310400005)(336012)(356005)(110136005)(55016003)(40480700001)(86362001)(70206006)(8676002)(316002)(478600001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 15:09:35.7988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1447161c-ceaa-48e8-44f0-08daa2f5c985 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7462 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Adhemerval,=0A= =0A= This looks good to me assuming Hurd is 32-bit only.=0A= =0A= Reviewed-by: Wilco Dijkstra =A0=0A= =0A= Cheers,=0A= Wilco=0A= =0A= =0A= From: Adhemerval Zanella =0A= =A0=0A= Use INTERNAL_SYSCALL_CALL instead of INLINE_SYSCALL_CALL.=A0 This=0A= requires emulate the semantic for hurd call (so __arc4random_buf=0A= uses the fallback).=0A= =0A= Checked on x86_64-linux-gnu.=0A= ---=0A= =A0stdlib/arc4random.c=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 |= =A0 2 +-=0A= =A0sysdeps/mach/hurd/not-cancel.h=A0=A0=A0=A0=A0=A0 | 12 ++++++++++--=0A= =A0sysdeps/unix/sysv/linux/not-cancel.h |=A0 2 +-=0A= =A03 files changed, 12 insertions(+), 4 deletions(-)=0A= =0A= diff --git a/stdlib/arc4random.c b/stdlib/arc4random.c=0A= index 960a38f295..c126c601bf 100644=0A= --- a/stdlib/arc4random.c=0A= +++ b/stdlib/arc4random.c=0A= @@ -51,7 +51,7 @@ __arc4random_buf (void *p, size_t n)=0A= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 n -=3D l;=0A= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 continue; /* Interrupted by a signal; keep g= oing.=A0 */=0A= =A0=A0=A0=A0=A0=A0=A0=A0 }=0A= -=A0=A0=A0=A0=A0 else if (l < 0 && errno =3D=3D ENOSYS)=0A= +=A0=A0=A0=A0=A0 else if (l =3D=3D -ENOSYS)=0A= =A0=A0=A0=A0=A0=A0=A0=A0 break; /* No syscall, so fallback to /dev/urandom.= =A0 */=0A= =A0=A0=A0=A0=A0=A0 arc4random_getrandom_failure ();=0A= =A0=A0=A0=A0 }=0A= diff --git a/sysdeps/mach/hurd/not-cancel.h b/sysdeps/mach/hurd/not-cancel.= h=0A= index ae58b734e3..5d2d2b4b8a 100644=0A= --- a/sysdeps/mach/hurd/not-cancel.h=0A= +++ b/sysdeps/mach/hurd/not-cancel.h=0A= @@ -25,6 +25,7 @@=0A= =A0#include =0A= =A0#include =0A= =A0#include =0A= +#include =0A= =A0#include =0A= =A0#include =0A= =A0=0A= @@ -75,8 +76,15 @@ __typeof (__fcntl) __fcntl_nocancel;=0A= =A0#define __fcntl64_nocancel(...) \=0A= =A0=A0 __fcntl_nocancel (__VA_ARGS__)=0A= =A0=0A= -#define __getrandom_nocancel(buf, size, flags) \=0A= -=A0 __getrandom (buf, size, flags)=0A= +static inline int=0A= +__getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)=0A= +{=0A= +=A0 int save_errno =3D errno;=0A= +=A0 int r =3D __getrandom (buf, buflen, flags);=0A= +=A0 r =3D r =3D=3D -1 ? -errno : r;=0A= +=A0 __set_errno (save_errno);=0A= +=A0 return r;=0A= +}=0A= =A0=0A= =A0#define __poll_infinity_nocancel(fds, nfds) \=0A= =A0=A0 __poll (fds, nfds, -1)=0A= diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux= /not-cancel.h=0A= index cf35c8bfc9..93615de681 100644=0A= --- a/sysdeps/unix/sysv/linux/not-cancel.h=0A= +++ b/sysdeps/unix/sysv/linux/not-cancel.h=0A= @@ -71,7 +71,7 @@ __writev_nocancel_nostatus (int fd, const struct iovec *i= ov, int iovcnt)=0A= =A0static inline ssize_t=0A= =A0__getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)=0A= =A0{=0A= -=A0 return INLINE_SYSCALL_CALL (getrandom, buf, buflen, flags);=0A= +=A0 return INTERNAL_SYSCALL_CALL (getrandom, buf, buflen, flags);=0A= =A0}=0A= =A0=0A= =A0static inline int=0A= -- =0A= 2.34.1=0A=