From patchwork Wed Jun 11 12:37:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 114216 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9288E3858D35 for ; Wed, 11 Jun 2025 12:38:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9288E3858D35 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=dpOn9PSt; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=dpOn9PSt X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazlp170110003.outbound.protection.outlook.com [IPv6:2a01:111:f403:c207::3]) by sourceware.org (Postfix) with ESMTPS id 339E23858405 for ; Wed, 11 Jun 2025 12:37:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 339E23858405 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-Filter: OpenARC Filter v1.0.0 sourceware.org 339E23858405 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=2a01:111:f403:c207::3 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1749645462; cv=pass; b=sHIslfQ7aOXynRVPKpSaE8Hntb06WBGdOvzkR5nZUpxM8Eym07pkrkVQmkhlkOGI1nORNGQuSkJlNupKgsJc/kYUxmf1EnYrWX0zcruakb7Z9/6kiIqAKo/q5DgnL8g56KYxX3yW14OJxhUTe4MRTlYkYeiUKVVxGcx/de2QPmY= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1749645462; c=relaxed/simple; bh=8dqfAIu65tv0o8SPA9O3LqxEQWfTUsHjz8J1PvOi+7o=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=Wlxyd8Rl1boCs4WLQlTHh7huqTpyLFK4QMsOFjBElgx9E8WSap1Ynh9s4jHPRiZFP1vbukIuz7hkafJM7nmzzw1KsrwNHqs9CYwL46re3VlIcffAlxuGvVH6+G7Pb+9lJV9rSB+7T7Z8gvIAIKkr7vwi28hJ1DlJu7ruvF9phS8= ARC-Authentication-Results: i=3; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 339E23858405 ARC-Seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=QOD427dXrGC+ZfWdy5EtHNRANK8/TurEludhFbnJ9Z2oqDtG3ZtPEfT1K30Qult3RwcMQ05l1A3v6lQXg2GIYFZVwq/D5mm48Wk3YNKFpP5w5lELg7v6LfMk8njp6FMWOLcPLZ3fW7u9GMHVZyVh/ZXxCNm0WYu2O+rptpRYHCnD61MZtfyF1NSQsowZPyELVHpiNa4TQA6FQh93tGzAM2c2GmeKQ4eBvF1ICYIXBIdXnW7g4oM0+mCdfEc9yHEshmbEPhmUz/ZOFW585RvNiR88VM5yULzkpXWjkXjQx5pPxlWh5umRodqpcUfMbvw3FFR/kbNbiTNTTJRoWm3p8w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CF6dHb0wtnxcU6k29W1/BrEwB/pvE4konSbAsReOPIg=; b=HbbzT3B43NuCgsiJhl/T9xItgFO4dpBZRGgekKGgSDqya3h+ueSrFKkj1fQ3rbTLwjSjrBfuaeZBMYB6ecOh6xndJ4TylUvE6SiwoPahkTyUeJqQR8dTOhQXlQTmBkdO0oyByw569r941yaCIEuZYxSBjXDwX60Y3Mm2HeNwILYp2PdJK9icYD+f9CuVlnW/RgnbGQkzshU3ZNwHagNiBRvTsS0rGQqDYQm7u63oe+eSpKVvpsaPMcyX/RVLFXOLqwpEVMwG1ZMyNYLYXAhTlSkPZwTgbpSC+2RynJuuI0HytOvgf6DvmsQQ1RO/4mblARRu0PzSOHoZb6XwYNdDSA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 4.158.2.129) 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=arm.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=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CF6dHb0wtnxcU6k29W1/BrEwB/pvE4konSbAsReOPIg=; b=dpOn9PSt0gkpP7nHxJiDPINBkxsctGgCdGnY06ERvs5WmQYAKx8DOXs+0YSA8oRJ6qDSIf2siQYW3OsHBdwLer1QJfvUuXignEJfQ1aAIByP8i0rFE29u/Ayw7zNevTciuAScS0oOWRa5xAbN5HOfaJ0e4DfRIeqVfgS25I8vO0= Received: from DB8PR04CA0015.eurprd04.prod.outlook.com (2603:10a6:10:110::25) by AS4PR08MB7710.eurprd08.prod.outlook.com (2603:10a6:20b:511::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8835.18; Wed, 11 Jun 2025 12:37:38 +0000 Received: from DB1PEPF000509F6.eurprd02.prod.outlook.com (2603:10a6:10:110:cafe::a5) by DB8PR04CA0015.outlook.office365.com (2603:10a6:10:110::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.35 via Frontend Transport; Wed, 11 Jun 2025 12:37:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 4.158.2.129) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=arm.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 4.158.2.129 as permitted sender) receiver=protection.outlook.com; client-ip=4.158.2.129; helo=outbound-uk1.az.dlp.m.darktrace.com; pr=C Received: from outbound-uk1.az.dlp.m.darktrace.com (4.158.2.129) by DB1PEPF000509F6.mail.protection.outlook.com (10.167.242.152) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.15 via Frontend Transport; Wed, 11 Jun 2025 12:37:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pmuMRsBhRLpwSulkGPjXYhfgqCcJRaHkU7+BZpARGs56Slcc276hbme3P2XNxyFha5cMdGdzD02GaKX0DSg+PgrKmGEMYWoT29sSJU9rBRLUeuptwh+SN45TudzVQZmMOXxypDY9tCac8bjOc1ZrTz9/vTNOcYxh8T9vweq15W2X8k66TX65OgKDLlp72d2Ko0MWRoCoyHOfkZY+ieeNxgowxJqvb7IRIbWZc+Xt6SKvQS/JTULlUWlfoteaZHCfHN9Hn7vPqwy5ovnrCpQNK8Xpfn0Kap2Lq3Ho9xXRiadMQh5A3SbblhxbpeIHkXlvaRAyy/xLgE3E+FGrsQM55A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CF6dHb0wtnxcU6k29W1/BrEwB/pvE4konSbAsReOPIg=; b=lnUJdD00uqGgmCiuZsqr1MSVOEVZVAm+P2+XQuZxHIFsPNV67UH6wzcC0+WNICFdpAGCN3FAD0+ldY1+NLKOaXFlkzYhUHhlmFj2Wpe14UBpFmNYOSwyoeMNToKm/2pu/5X5h2r3hA/V5R6L0T0RRWIY4v1FsfiRiTyHLhatXg+HpNZ0OK7YuoE43led42vVe6nuVnZ5J45mdJEgOgi6p7gDziLHiUN1MtNHorx/9IWKcY39ggm94MNhTog5HyKYPrYciUDrwTY9XVN4VfLyGxkhpvsMbtc0ssosEVO2wrY41xFzXe6uawbBrUzJ9cie0iXBODeOnpmR0zKdB7RITA== 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=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CF6dHb0wtnxcU6k29W1/BrEwB/pvE4konSbAsReOPIg=; b=dpOn9PSt0gkpP7nHxJiDPINBkxsctGgCdGnY06ERvs5WmQYAKx8DOXs+0YSA8oRJ6qDSIf2siQYW3OsHBdwLer1QJfvUuXignEJfQ1aAIByP8i0rFE29u/Ayw7zNevTciuAScS0oOWRa5xAbN5HOfaJ0e4DfRIeqVfgS25I8vO0= Received: from DB3PR08MB8986.eurprd08.prod.outlook.com (2603:10a6:10:42b::7) by GV1PR08MB7913.eurprd08.prod.outlook.com (2603:10a6:150:8f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.28; Wed, 11 Jun 2025 12:37:03 +0000 Received: from DB3PR08MB8986.eurprd08.prod.outlook.com ([fe80::91ca:2275:c710:94af]) by DB3PR08MB8986.eurprd08.prod.outlook.com ([fe80::91ca:2275:c710:94af%3]) with mapi id 15.20.8835.018; Wed, 11 Jun 2025 12:37:02 +0000 From: Wilco Dijkstra To: glibc developers CC: DJ Delorie Subject: [PATCH v2] malloc: Improve checked_request2size Thread-Topic: [PATCH v2] malloc: Improve checked_request2size Thread-Index: AQHb2s0jwpSQh0qPXE6SibTPEQlJpg== Date: Wed, 11 Jun 2025 12:37:02 +0000 Message-ID: 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: DB3PR08MB8986:EE_|GV1PR08MB7913:EE_|DB1PEPF000509F6:EE_|AS4PR08MB7710:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fdb7562-80e7-4fc5-d720-08dda8e4bffc x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; ARA:13230040|366016|376014|1800799024|38070700018; X-Microsoft-Antispam-Message-Info-Original: =?iso-8859-1?q?LQNouf8NZE0ubgXxi?= =?iso-8859-1?q?t8tlBV49ABBsIc/t/3GhBSyi95efsKGXBWZHkbbb98DQqBxXtRNLlfuwCklv?= =?iso-8859-1?q?NKNlS5jL8Hay3Yrzya1j3JYmB0o8T0iCWWBfDNlalpvwSruaGvamRpai0eKJ?= =?iso-8859-1?q?v4pq0ZiHK4msBkF5hilY+0TxXU7za8Gz/Aya0GPmf8PIqqFHp4MNTQN7pbhR?= =?iso-8859-1?q?HTtlxU+7gKw2ZYXGYz2x7AcKTBnbeBUVHn4Hj5CsE8IApaPwltGPXXQHxDLA?= =?iso-8859-1?q?lEgeqk8ugghpjr+oamPUUh/6OjzBydS2d4IKxKmnAOQ3e2bE4ab35qT8YTNs?= =?iso-8859-1?q?Fnqn9Hb8tOIeN5SmdWNMttBFTmvE78Bo8eMyNxy//jMfbxBJVWPYpGkDc2Bz?= =?iso-8859-1?q?gl132ETo7ymCszQO6RGMG72UdlVvFICHXLlaBHebjXoCksVWW9z2eYnOSCwa?= =?iso-8859-1?q?I3CAMGVCtqev+rHAMobJ0LSlXdpzYPDcMmCqKI9dJyl62H9KGl8ahJFCJDk/?= =?iso-8859-1?q?E2dSMZOOVd+K/rW0z0EfyOXprsNQvv8xryeci5Fk1tn1KGcQJmx1V1Eq2bH8?= =?iso-8859-1?q?7Y4I7S8w96X2hwe/uVwisTF2jPi0ndpFHOKaF0VoEe9Jpox2HAzQKAlrm15Z?= =?iso-8859-1?q?b4c8oHMHKoLtdQzd/jOKdOkjxhcfM5YMOIwah+lO6djp1tFJWvrp/MJHBhg7?= =?iso-8859-1?q?TtfJrcLuNDUtzIWB6CGPwBGbiDpM+L9Dt/s8KVRYZxcnbGfc+uDJsgxgRim2?= =?iso-8859-1?q?4ImF+7vG+VdNqLEwILe/ij+21ufElTWb0kHdssVBujr7zIegSk3aurhMUO/g?= =?iso-8859-1?q?sgARB3S+bPhUpfUIEt025RIxvPAgiE6x9SC5SDLH62INNMYTsJnU91iQAC00?= =?iso-8859-1?q?blK25XhZu7O8ZwqKiDluqAIfzfDO25HE29al13ki69hAk6vRq7nLEr6wg1F8?= =?iso-8859-1?q?kpAmuK/tLHNtPmeRaGD4phMvqBdlzcNrAMRIRe35gNOadL2DTDk8W3FqZJIc?= =?iso-8859-1?q?FwMTA6DCs7MAycto0J6WzzP6y921N4gHX1PoPvZNZKsB9kymSi9BWpuGAdoh?= =?iso-8859-1?q?OSQjTKWc56AS62qpofuv10q57e50jrYoLnM1nLRDV3owy5NzwfYWaRpqpelI?= =?iso-8859-1?q?5HrXiaD4hLD0/BVGT3hvp3G5ek0awKgiT5zxWzfLQz2tV/uU7944VjCCj5Jo?= =?iso-8859-1?q?wbOAAVsbmTmWcB/u6HYJjmb/NjsxVEvuJaEHlEyk0yp9TYGNAxGndVsCt/Tk?= =?iso-8859-1?q?q1h9NxYiyRK3JFCLGaoWOuIYqTGqBxgUFvaRBWMxPNg2MFX7g8iRq07oG3k5?= =?iso-8859-1?q?GOUCJyUHX7squGxJBcjneFLDOD/5Ck3o8Kv9KEtP47q5y9cKqan4pIZyT96/?= =?iso-8859-1?q?g6q6WCZzJgHLoNqxDcmpmoEnJ1upV4w4zg/rpPBKgFwrOG7mOPjnGTGCDqP9?= =?iso-8859-1?q?2Y96G00GLbl2PtryR2OgESjuNucQhonwIoTiJOkJ5KyMrm0VexUu5ANgNKVv?= =?iso-8859-1?q?3WsSWn/kPoF5vqDMj411YdPB1AfQyMp50eOxSexdEU1Fj/8yr0QygeZOkE?= =?iso-8859-1?q?=3D?= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB3PR08MB8986.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(38070700018); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7913 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB1PEPF000509F6.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f3b3332e-9ab6-48ae-d9e8-08dda8e4aa7c X-Microsoft-Antispam: BCL:0; ARA:13230040|14060799003|82310400026|1800799024|35042699022|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?iso-8859-1?q?G2Cqg+UkvXJ/jh9H9upkKoKd2L?= =?iso-8859-1?q?PzJlJXaZ2IAgcj+eVV3UvNCdsYETgpyx1Z6R2LxFCMfAScAVUilsMeA9ByyR?= =?iso-8859-1?q?QDu8a6KR3u1OSAaCqjp8WTeo0bxcHZmISRnISJyhDHljtWj7LAl+rhrnj67G?= =?iso-8859-1?q?P0vpSALgPnTlD0x6FNgGVgbg9UBOrag+4x1X1eCBJQyZnnM0RwQz3ItdKYIZ?= =?iso-8859-1?q?ESnGWiQkg178f+AZ75NdNEJc5Z5k4Xt6WddkE7x3uoC9SqNYaIUY+TNUlSNy?= =?iso-8859-1?q?Qyu4/zPUyyTjUblRJN8s+oUowjUMn5FpAI2YdMaHQ8UAGDINMyZBT/d6XMNN?= =?iso-8859-1?q?iNDfGf0XiZvnM7IzN7lHWP2rlevhBrunmfdk5UIK47D1eD7r0LWA2eqUfXQF?= =?iso-8859-1?q?Zy7SlsVgcMqq/BGMxbFOrV+5S/uJQQi60WIfznTthYP0tSAnI22AwQZRBn0b?= =?iso-8859-1?q?PRYiBvsFjYw+3Sh5PKACVScdTgZ988w+ZdBImm1JjOGORzbvuxBIJoN6/ZQj?= =?iso-8859-1?q?JI0CmKjqEbtxUk5iQwBeqVVRryi7voz5ccvexfStfLPSkPk+WVlMLfZbfF5V?= =?iso-8859-1?q?kSvJl56cnaFBGTTyoGl50q4s9lkqMVC00ELnghqe16KfTc9H8hHEMy+qihMf?= =?iso-8859-1?q?222zZR1S6yC93FHH+FyMZS6NCDgqUlXbSukVYFjcbtg6EgXs8TuMtjZ/my9U?= =?iso-8859-1?q?dQOlZ6CEdzxCIkS7ws/+PCHIbdVbps23httqRPCaQrJcWZlNMME+R0JuL2ZU?= =?iso-8859-1?q?/00D2ZB5iteaw3XgN9h9Oj8d06sKoiksTYz48Cq/A4MiV89hHtS6S5Lm0tb1?= =?iso-8859-1?q?LsACHWs4ff/GSxFEdJEmKhlA6Qkr0kHkwJsyymBU7TelA0zCE0aMqOwXohRu?= =?iso-8859-1?q?t5HCS86WU1A4727dlTnFQSFDjNFYUPaXIUnnrmCRnghsVt6AZ+ptSUD+rV0G?= =?iso-8859-1?q?Sx8VTNuNvYzUQ66hvHNl1jXZoJ0QebNz+3c0P5TVwbKs25SNceR6kqauiOkg?= =?iso-8859-1?q?kv9RN5eR+klgOeIcAFi2lleYOqXxU2Of2DfvhtnvU/mYEzS6cIbl28JHvIm9?= =?iso-8859-1?q?d89CV+o0QGt2WpL92PPEJPnNm7hUesQMlRYvU8hNaCv5A6HddziWqxTmNdCs?= =?iso-8859-1?q?fPu/ZXICeo4epWpOZJQGNFocPDtAiyqdf61VdGvLsUVMMtdBZobJB9vpvUr4?= =?iso-8859-1?q?rlyWIizPW8ZHCCtwqSKuRTx2QZbBmB9pnid/98DTmUFWPERmwkf4zYHscV3r?= =?iso-8859-1?q?PhS8vmMofpLP/pDpiFPNCo/l3EutxYmMFd5DVv9mL+s3HcvP0XV6bNjmjF/8?= =?iso-8859-1?q?La+1zUVRbPWdtrZQ5CychvhcqAMlXbeG1GFeEf1UIpfKI/EDDgr065XO9Spn?= =?iso-8859-1?q?eFNnhM4PTigl+Ji/ogyTYSdCubGMrru4umL3hLrciaZqJGii9j0pjJ5nO8/g?= =?iso-8859-1?q?Ky3/ZaNtG9P33+uJKLz22n/N/xCQuudAiCm8pckvGYi9O0N+w47ZzSwQ7WrP?= =?iso-8859-1?q?MPnCno773Qc8Ldu5RoEjwcWlZjgRPLq//HSKXsscWbVnLkECpYPBjwnftxMa?= =?iso-8859-1?q?YZHZ5Est3t?= X-Forefront-Antispam-Report: CIP:4.158.2.129; CTRY:GB; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:outbound-uk1.az.dlp.m.darktrace.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(14060799003)(82310400026)(1800799024)(35042699022)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2025 12:37:38.3021 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2fdb7562-80e7-4fc5-d720-08dda8e4bffc X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[4.158.2.129]; Helo=[outbound-uk1.az.dlp.m.darktrace.com] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF000509F6.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7710 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org v2: Use SIZE_MAX, add missing case in malloc-check.c Change checked_request2size to return SIZE_MAX for huge inputs. This ensures large allocation request stay large and can't be confused with a small allocation. Passes regress, OK for commit? diff --git a/malloc/malloc-check.c b/malloc/malloc-check.c index fbb030116c3cc7e0b3a577822f11467d97c82b8d..44415e48a9de865cb3dc4b10c5e5c40be0f8f1ef 100644 --- a/malloc/malloc-check.c +++ b/malloc/malloc-check.c @@ -275,12 +275,12 @@ realloc_check (void *oldmem, size_t bytes) malloc_printerr ("realloc(): invalid pointer"); const INTERNAL_SIZE_T oldsize = chunksize (oldp); - chnb = checked_request2size (rb); - if (chnb == 0) + if (rb > PTRDIFF_MAX) { __set_errno (ENOMEM); goto invert; } + chnb = checked_request2size (rb); __libc_lock_lock (main_arena.mutex); diff --git a/malloc/malloc.c b/malloc/malloc.c index c40b793f4a5d6b3b80e086f47a9ec72ad62b6526..efce6380d2fe575d7f2b96963167a869384238f1 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1322,8 +1322,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ /* Check if REQ overflows when padded and aligned and if the resulting value is less than PTRDIFF_T. Returns the requested size or - MINSIZE in case the value is less than MINSIZE, or 0 if any of the - previous checks fail. */ + MINSIZE in case the value is less than MINSIZE, or SIZE_MAX if any + of the previous checks fail. */ static __always_inline size_t checked_request2size (size_t req) __nonnull (1) { @@ -1331,7 +1331,7 @@ checked_request2size (size_t req) __nonnull (1) "PTRDIFF_MAX is not more than half of SIZE_MAX"); if (__glibc_unlikely (req > PTRDIFF_MAX)) - return 0; + return SIZE_MAX; /* When using tagged memory, we cannot share the end of the user block with the header for the next chunk, so ensure that we @@ -3513,12 +3513,12 @@ __libc_realloc (void *oldmem, size_t bytes) || __builtin_expect (misaligned_chunk (oldp), 0))) malloc_printerr ("realloc(): invalid pointer"); - nb = checked_request2size (bytes); - if (nb == 0) + if (bytes > PTRDIFF_MAX) { __set_errno (ENOMEM); return NULL; } + nb = checked_request2size (bytes); if (chunk_is_mmapped (oldp)) { @@ -3887,12 +3887,12 @@ _int_malloc (mstate av, size_t bytes) aligned. */ - nb = checked_request2size (bytes); - if (nb == 0) + if (bytes > PTRDIFF_MAX) { __set_errno (ENOMEM); return NULL; } + nb = checked_request2size (bytes); /* There are no usable arenas. Fall back to sysmalloc to get a chunk from mmap. */ @@ -5047,12 +5047,12 @@ _int_memalign (mstate av, size_t alignment, size_t bytes) unsigned long remainder_size; /* its size */ INTERNAL_SIZE_T size; - nb = checked_request2size (bytes); - if (nb == 0) + if (bytes > PTRDIFF_MAX) { __set_errno (ENOMEM); return NULL; } + nb = checked_request2size (bytes); /* We can't check tcache here because we hold the arena lock, which tcache doesn't expect. We expect it has been checked