Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oxjW8-0004uD-P4 for mharc-grub-devel@gnu.org; Wed, 23 Nov 2022 01:45:57 -0500 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 1oxjW7-0004u4-7A for grub-devel@gnu.org; Wed, 23 Nov 2022 01:45:55 -0500 Received: from mail-am0eur02on2062d.outbound.protection.outlook.com ([2a01:111:f400:fe13::62d] helo=EUR02-AM0-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxjW3-0002AL-J8 for grub-devel@gnu.org; Wed, 23 Nov 2022 01:45:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ky3adlnnlPDTdjerGGkFA8SDw+L6YVDNuYdV06cIIvVMrmgwUG1h/Jq5J2K6dzhYvUv0+zLlkL65GqgJ86WsesuLnAKR7zBOnAphZ+WL9hm1b1cQdBkR9oXzZBpdEHT9bzrRzZaUPIuJr5yzj5OQ/an/esp7MmZP7q38GAh91ktzaxO9UnomatCVrgpgOapYkmHfwlOYGCcIZdb+jrG4M9Gw/pVmeKd8VRF2BfB2h1933D4R5euAhI+IkChTI1WR01un1n9T1vaAkxl2dOwJQpOqkPxMfuFeDlmhIGTGMhfktpcIpXDMICfrwNwykq2STlFZKenWyZaXs0BLOx83Ew== 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=RlypYxq3/9bCLbZLTrDMFDIlx7icK+PEYHOFOWpvWJA=; b=blHiGleTasPr2XnW+JcAjetUvHwIbMZpjfMnhmlcV+2+tOD7g5XLUsRfpb63jbCFekpaVXm4kEJfkL+C6UbcBc5DIubMzaLXVaxIaVTZt+0vN+n/yhuYoUfASgc10TnGkk7sdHyavFeC9bjlYwKcOAz+tYHEZISMv7wLH3S2L7lhYzI+H9si5TLuQifQLw1lItXPRv5c9ihJ2QfwWYgo9+KS1KO2uMvxXVJP/qkwK23NRtToZJZ8IYxzqRpSioQyQnn6/1NTSCP3BtLYt/pNOPMtHgZNBE2qzDa9m9A8gpZkmEQE52VpA9Nz8vGYdgNJvLPV1CkjsbPzwZFpjApdaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RlypYxq3/9bCLbZLTrDMFDIlx7icK+PEYHOFOWpvWJA=; b=3nCx/tZNBX/YC627WYiH5st4zlOKbup47T+l1EeLmk3Ndj9fgN5OmVL8sM/St9wBRntpI8j5Qd5/kno9njolmz6VZkM7YhYT4vhCtkk4nz54H1R9nR1/UirJGdRsaegWEFQOuoL4sCCGfdoYD27zBgOQZNNx35oiWzvfteHRN53+SSZYD5QjbvnqYIoXNi8WxDu3TZEsARHFRVk7AxcWUGqd3kdQInRe5sGmrfpKZ5jMgZg54VLHvmr8uxIq7C9TDxwJngeQWmskMVq4tb8uc1XJ7PMCp8homeVY3JcVCLfd/TgEi5PicGXF/rlGHYalx+iUcaErs6iATv8zYpOCrA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) by AM8PR04MB7810.eurprd04.prod.outlook.com (2603:10a6:20b:237::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.11; Wed, 23 Nov 2022 06:40:29 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::c3d7:a3aa:ceaa:6acf]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::c3d7:a3aa:ceaa:6acf%4]) with mapi id 15.20.5834.015; Wed, 23 Nov 2022 06:40:29 +0000 From: Gary Lin To: The development of GNU GRUB Subject: [PATCH] loader: Ensure the newc pathname is NULL-terminated Date: Wed, 23 Nov 2022 14:40:21 +0800 Message-Id: <20221123064021.7318-1-glin@suse.com> X-Mailer: git-send-email 2.35.3 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYAPR01CA0240.jpnprd01.prod.outlook.com (2603:1096:404:11e::36) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|AM8PR04MB7810:EE_ X-MS-Office365-Filtering-Correlation-Id: 53a82bf5-4bc3-496c-5f5d-08dacd1d9c6f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VFdHAoqN6A+WwJct+9COGKFDCC5w7W6QyWcfj2MUiluYb3TcOPVRHMuuvfxfvOAssACxJ7GF/tByW5h/UmpnR7qvk7RUFvaSHAeN46RzJMLV7ju5FPbPD+yGCBDa0481aKSjrEE3+t+a6CA60/t28Bw9T47MMgX4ynDCUFrlWDIWi2WC8lExVgdkunHbr+zbzUK8L8wLj76gwWJKTVo39SWh6qKXAfQmjKybw/qgSyw+sw4n+KrY5vUcXWDN2vVoOw+rBHZUXzu7JE8w0tfgA/pApfGPxOIpuo/dRMDDKvqeS6Cind2QHn2PM3V0QQvpBxB38XTb9NnoGZEmkHUePNH/pF+XgcvrPajzTkZNV035/7VsbRzar3FLn9LsKKkhmfk+PKsKEn0a7iJH0aH201Ioyo487R8C2TXsayL2CfQ7yqK4GcqDzU87oA6+10QcnKTXGyW/IKNf/r1OaBP8T7NT5AVRvY7DZce829NIwt85wzxmF4bngz1PTWW1sLRt5Z/ced2/4r+7w/n7JZERsh1Qv1jKWWEVJnWnDcfYoUkUzNBWDmRA2VyCYgDme0IvElpIUT4ui6fo3hQw0HL+X99epZ0awJv3eJABP5XlNS2C0YDGHIlPRtRLJbOUuCJ4 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6140.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(136003)(366004)(376002)(346002)(39860400002)(396003)(451199015)(36756003)(86362001)(26005)(38100700002)(2616005)(186003)(2906002)(6512007)(1076003)(83380400001)(6916009)(8936002)(5660300002)(478600001)(6506007)(6666004)(66556008)(41300700001)(66476007)(8676002)(6486002)(316002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZziPk9CpJmzaol1OWt5oG6UUzIysfqtG1gB12AY1haGuMkTR0a+FP1qhn3Du?= =?us-ascii?Q?u9gnhb3OYwbSwmfyh3p8H+YHrGW/mrx5QaF8Iy+tg1tuFxnBoCUK+5FeWTNX?= =?us-ascii?Q?HDTkTF2lhVMK7WmTtFvKJ9T3ao5NLXyQmFXySRifoVZfx+XGdtQG/FY0qHYd?= =?us-ascii?Q?0HvIlIHW+VjQJWwzLfzL28df/uQsURcJLqScxf0mzSQT2NQhPdRHeeHTJfLx?= =?us-ascii?Q?qKNOta+iBK43sW2qvsiiJWhdmjgdTHg1PbCo2dLx8pYg6LL8fMs1yXcwXSDe?= =?us-ascii?Q?fFWAJ8IBiCvBguF2AdG3E0EhKnT7uCTgsOwLnv/Ol9VUJ5o8dtS5P2hYutPJ?= =?us-ascii?Q?sXDVjoM5Mayk6W11z/TU9qWuAj2lr4d0LcY33Qw4chhhNVyUlmkurf3Dajcd?= =?us-ascii?Q?H/nLcMh7KcHHy0DDvdn2PvsWRWp42kjB5LwiUQmZCqmHUZ48YMccYhIxAn2k?= =?us-ascii?Q?DIhfEytJ5FIEEQunsvv2bnRzxUUA4ZWnlRqeZ9BWU9IXxmx8G81Lcs5+1qeA?= =?us-ascii?Q?kVV/7YPexmyM/dp+7oD7w28g3cnu9/HCvSbsYZPXW3ratJfcuP9Gp9qOa80m?= =?us-ascii?Q?gDDsd2w0uec329NvEZmDE/RTignM1IVDxMwaaGR/QNyj1ITYLkh7ZYXvV4y9?= =?us-ascii?Q?bDzSXDSBFs7NPWpiwt+kn9Uq+PGng8/AYMXSxjlO7kwkGlNgvfipXsCTpHwq?= =?us-ascii?Q?QpsdpdMiZF496yWiSYENa1VQPyZh2CCW94NtmP+zMkQHzP/qmYgHjXk7miwI?= =?us-ascii?Q?oUEliig1NiUPX2JTPD/K+UG52e3gzmjLQwCvwMx2AKuq8fJnY4n/z8m+9Xci?= =?us-ascii?Q?NMglDtOlyDmcN2L2PQdYdxyWACjgaBosBzkhTX8X9f6NXO+wJn8zTaWlo/6D?= =?us-ascii?Q?xv5e656rynVo+zxHa80r2KvIyviLkYUf1HTXC9OHHsw3PIMMivymjysOoT2e?= =?us-ascii?Q?nS/ijdeEb0KvgT9GGLIofGG3fYNiAogOIsmCwA58gWCy+z7OoNseqrdwh5V2?= =?us-ascii?Q?Jlfq13/B25jCX+FuEqSwcMRSjYcWcCLoRcS/zwQFwLUyaF5zv6WFw/JA1jdT?= =?us-ascii?Q?5iZ4J7pkqnvHsb/dlE1VMqY7OOyiwDgptKtok/99HyLPhVfzw2kHQxwal+Hv?= =?us-ascii?Q?1jPfFHed3pNrYrrcyHpqRLU39nViuZYycyhjMq+tmdW4OA1pUH731tQkIk9U?= =?us-ascii?Q?oloi63DomqzKz4xEYTLM2euu0msbsOA7doOH9KrnweD/W7q7IR7y9I1iA4WW?= =?us-ascii?Q?sdb8YfI1lnH2J4QAlILY9utImGaA1Ziy+hfVgI6tqqsx0ZZfShpJYcGfVp5i?= =?us-ascii?Q?8SY7RLEQTYej6fJuWjxMJkd9v1iWab1Y2oLKhjSwOTulnJPUChUJKwkOFcz5?= =?us-ascii?Q?9VQUxDyCjZDI2c2+Sl1FIrAkpi8fRN/jS418IifqrCbmDlgUqsQDc2+zXToF?= =?us-ascii?Q?IhJiTLg0sZtTSDh+fCOWGnXWNMjXiA0GFd62W1ElyGiTNfSnPDjUjupkLciU?= =?us-ascii?Q?O2yx/EY53Oh3DZ5xh3G1E7TXYZl3fWYal+bikSIbIgTxzs04k1pCv0G06Y9K?= =?us-ascii?Q?KTjmadsK88SvbbyBW2M=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53a82bf5-4bc3-496c-5f5d-08dacd1d9c6f X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2022 06:40:29.2386 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3qA6p89dXq2S35R842l/mTXNREs8GrLXvfSjeoT8DNXa/kU7GyzPYH4RO2A9jHME X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7810 Received-SPF: pass client-ip=2a01:111:f400:fe13::62d; envelope-from=GLin@suse.com; helo=EUR02-AM0-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2022 06:45:55 -0000 Per "man 5 cpio", the namesize in the cpio header includes the trailing NULL byte of the pathname and the pathname is followed by NULL bytes, but the current implementation excludes the trailing NULL byte when making the newc header plus the pathname. Although make_header() would pad the pathname string, the padding won't happen when strlen(name) + sizeof(struct newc_head) is a multiple of 4, and the non-NULL-terminated pathname may lead to unexpected results. For example, when loading linux with the following command: linux /boot/vmlinuz initrd newc:test12:/boot/test12 /boot/initrd Since strlen("test12") + sizeof(struct newc_head) is 116 = 29 * 4, there is no padding for the pathname, and the following error may show during linux boot: Initramfs unpacking failed: ZSTD-compressed data is trunc To avoid the potential problems, this commit includes the NULL byte when calling make_header() and adjusts the initrd size accordingly. Signed-off-by: Gary Lin --- grub-core/loader/linux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c index 830360172..2b26d293f 100644 --- a/grub-core/loader/linux.c +++ b/grub-core/loader/linux.c @@ -127,12 +127,14 @@ insert_dir (const char *name, struct dir **root, n->name = grub_strndup (cb, ce - cb); if (ptr) { + char *tmp_name = grub_strndup (name, ce - name); grub_dprintf ("linux", "Creating directory %s, %s\n", name, ce); - ptr = make_header (ptr, name, ce - name, + ptr = make_header (ptr, tmp_name, ce - name + 1, 040777, 0); + grub_free (tmp_name); } if (grub_add (*size, - ALIGN_UP ((ce - (char *) name) + ALIGN_UP ((ce - (char *) name + 1) + sizeof (struct newc_head), 4), size)) { @@ -191,7 +193,7 @@ grub_initrd_init (int argc, char *argv[], grub_initrd_close (initrd_ctx); return grub_errno; } - name_len = grub_strlen (initrd_ctx->components[i].newc_name); + name_len = grub_strlen (initrd_ctx->components[i].newc_name) + 1; if (grub_add (initrd_ctx->size, ALIGN_UP (sizeof (struct newc_head) + name_len, 4), &initrd_ctx->size) || @@ -205,7 +207,7 @@ grub_initrd_init (int argc, char *argv[], { if (grub_add (initrd_ctx->size, ALIGN_UP (sizeof (struct newc_head) - + sizeof ("TRAILER!!!") - 1, 4), + + sizeof ("TRAILER!!!"), 4), &initrd_ctx->size)) goto overflow; free_dir (root); @@ -233,7 +235,7 @@ grub_initrd_init (int argc, char *argv[], initrd_ctx->size = ALIGN_UP (initrd_ctx->size, 4); if (grub_add (initrd_ctx->size, ALIGN_UP (sizeof (struct newc_head) - + sizeof ("TRAILER!!!") - 1, 4), + + sizeof ("TRAILER!!!"), 4), &initrd_ctx->size)) goto overflow; free_dir (root); @@ -304,7 +306,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, } else if (newc) { - ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1, + ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"), 0, 0); free_dir (root); root = 0; @@ -327,7 +329,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, { grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4)); ptr += ALIGN_UP_OVERHEAD (cursize, 4); - ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!") - 1, 0, 0); + ptr = make_header (ptr, "TRAILER!!!", sizeof ("TRAILER!!!"), 0, 0); } free_dir (root); root = 0; -- 2.35.3