From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) by sourceware.org (Postfix) with ESMTPS id 73FD13858D39; Tue, 28 Feb 2023 21:20:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73FD13858D39 Authentication-Results: sourceware.org; dmarc=fail (p=reject dis=none) header.from=nvidia.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DqnLzYHCPYUYvt1mM/eeXBWFzXIxCVPnJ46LBUBPO28Qd+uGJ87bBwiO2vhN/23otC0Ez+ailjvCAM0NSP3vDNYXinM1jzKCZmwcH1FnPKYe3Lnz0Gypl2rD5rEHee2mf4ose/92x+UrqQHKeqNaMk8hWmtnNqgyGo0Ct+vymansCf+KYIYDBz/kGjV2v3r9hQQJCQnuAKnlMwQmLoMZIO0Thd38nMYZNFEbsNG9D2dw9paMF997fz7dLWCzHLPewf4B+bsZXr/F1qyuU7pIWUo7JyEqaTwnNRi9WpeNi6Wwe7pyUiGs2Zi6jGagVX+AO7E4C7/7C6D2kBdyClsJFw== 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=qvuBWo4UhGwgGnTGDtE/7HEcMGOcB+P8Bjbv5pHwsIM=; b=mtOJqeBqpUegDVZ0gCe5Uud3p2/Ko6DGadPK49IgbtsdglkqD9XdwjV/RrlpdiNorA/dXGKfg7u8ebM1bnw07nNT4xyIA47r3meeXImakP/1QCwfkcK1xb3WDEzPdSP7VCu3Q8la7sA4etfzMH/Kr0wwiiBfxxoB1iA0HtqOnDe2wiSc1eMZ2WWtZTDnIjrbxAoPUPpURSldb0/19+DO0wzl7hCNwFaV4qEvyQcaD0Cgtda7ABCI/sTrT9WNSBALU4zCmtcAMqSs7hpGxDrPXeIB693ljUsAaX0SVS+cIS2zV+9N8Tds1bK/CBdX2z4VHcbQp89f6K7WQMwel0mYJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=sourceware.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qvuBWo4UhGwgGnTGDtE/7HEcMGOcB+P8Bjbv5pHwsIM=; b=GZJgbORKm0GCZy/8UsSNR0D1JVBjZh72Huks5EZngWijPYQOnylMwUgkdLHvLU2AJ1u0HIuf6jzGWZ8KtqQZZe4pBflp1TvNS2AvebAwlW97vqg8DZE8P4BdiE7qEk1QGAeFyov9CHEAnYWKdf9YMq8SIlJcaM3cg7akBa7Ufe/7lO+rBXw0SxamNp0tKsNHnBtZLVbi9P4epCnTmeqtIF2Xwvsekw18gcc7tm379RThR/MYl999rQo5J3DFn2jvJiIw1G6WYKwq9UZja2+KbkvQZ9jB/1BYR9JZ2Yp1dNM8c5ClL77f2R6P99vG1mmiWLKW528ZU+xW1xOTGJXuBA== Received: from DM6PR08CA0006.namprd08.prod.outlook.com (2603:10b6:5:80::19) by PH7PR12MB7018.namprd12.prod.outlook.com (2603:10b6:510:1b8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Tue, 28 Feb 2023 21:20:32 +0000 Received: from DM6NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:5:80:cafe::6) by DM6PR08CA0006.outlook.office365.com (2603:10b6:5:80::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.30 via Frontend Transport; Tue, 28 Feb 2023 21:20:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT021.mail.protection.outlook.com (10.13.173.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.17 via Frontend Transport; Tue, 28 Feb 2023 21:20:32 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Tue, 28 Feb 2023 13:20:21 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 28 Feb 2023 13:20:21 -0800 Received: from localhost (10.127.8.14) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.986.5 via Frontend Transport; Tue, 28 Feb 2023 13:20:20 -0800 Date: Tue, 28 Feb 2023 13:20:20 -0800 From: Robert Morell To: CC: , , , Subject: [PATCH] malloc: Fix transposed arguments in sysmalloc_mmap_fallback call Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT021:EE_|PH7PR12MB7018:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b149253-c17e-4a3e-149c-08db19d19fd0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ENVpnnxmma1bl1dslZ1aPgZ+bQdEqKiSYq6oxBnQWwGJmr3gk/NFwgUfj2AOWoYlUW3SqdhCbCr+hoR0/IIGW9MdGBFfGXxsgo/cD4Q5r7KDztApuXWdqhkiqtHjvVqmnjxfCOy9yAg74H/abetlY3+i6e+cE105kM10L9xexRlqZxQbUidQFT4CY8d6G04sDGkB1p8HfE+d87+xgXHmdhN4vJD657FtUi5WCVI0Ffdm+z2f6lQilZ/AXtz5YPmhcw/RSLkkN3KE6ry5NH3SM9Sg74FAxgdKrhBssIKyJZM5ou5TLGTkgPCTEdIBWN1w/LuVhP5j5YuKKoInMtXJ2VfiA1hsM6U9C2VwQmAAxgmf87U4SCBkIVVoBQqMAikf0PLOvGaxKL7Jo5gPSmbE6ouWhX0kjqMQPaeJukTasrPFHOUBEdqJYJx9db15mizJgA8bl0z5bbhIrFc3Xy4oibuGs5hEkXYqrShZ2LuQNd11CqmWisD68NykVf4MoQfwSQSB91ySm94Xmlsu11Fs5Lal7oOQY2nINlT5ZTTYOK2gYv50mZDHYmVhvFRiJVNPUdL43O5cnDlJspoxMfDEH8PEU05En6rV6jjXW3m5uFttOeK4UcTinNX2W4b4VjbrakSr72NJUWJrTY01hDxtQD7PM/3dcg4Tfw/rEbB4Rimnf19sxwv5P+iLGA+A6dRNnRlJae/EYMJZam65SgiV0fwSxFnOrBzueu7KJMt0owo= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230025)(7916004)(4636009)(396003)(376002)(39860400002)(136003)(346002)(451199018)(36840700001)(40470700004)(46966006)(40460700003)(9686003)(2906002)(7636003)(82740400003)(356005)(36860700001)(5660300002)(8936002)(70206006)(8676002)(70586007)(336012)(41300700001)(6916009)(40480700001)(478600001)(426003)(4326008)(186003)(47076005)(26005)(83380400001)(316002)(82310400005)(33716001)(54906003)(86362001)(34020700004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2023 21:20:32.1724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b149253-c17e-4a3e-149c-08db19d19fd0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7018 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP 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: git commit 0849eed45daa ("malloc: Move MORECORE fallback mmap to sysmalloc_mmap_fallback") moved a block of code from sysmalloc to a new helper function sysmalloc_mmap_fallback(), but 'pagesize' is used for the 'minsize' argument and 'MMAP_AS_MORECORE_SIZE' for the 'pagesize' argument. Fixes: 0849eed45daa ("malloc: Move MORECORE fallback mmap to sysmalloc_mmap_fallback") Signed-off-by: Robert Morell --- malloc/malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/malloc/malloc.c b/malloc/malloc.c index 5829f3fa9b4b..76c50e3f5817 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2725,8 +2725,8 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) mp_.hp_flags, av); #endif if (mbrk == MAP_FAILED) - mbrk = sysmalloc_mmap_fallback (&size, nb, old_size, pagesize, - MMAP_AS_MORECORE_SIZE, 0, av); + mbrk = sysmalloc_mmap_fallback (&size, nb, old_size, MMAP_AS_MORECORE_SIZE, + pagesize, 0, av); if (mbrk != MAP_FAILED) { /* We do not need, and cannot use, another sbrk call to find end */ -- 2.39.2