Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nYjNP-0001Ss-Ho for mharc-grub-devel@gnu.org; Mon, 28 Mar 2022 03:01:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYjNK-0001Oi-4I for grub-devel@gnu.org; Mon, 28 Mar 2022 03:01:15 -0400 Received: from de-smtp-delivery-102.mimecast.com ([194.104.111.102]:46021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYjNH-0003XH-Tg for grub-devel@gnu.org; Mon, 28 Mar 2022 03:01:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648450870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VvgoERBlU2Frv3GpzWawjB/4icZL54h9w2Z60kLr7EI=; b=TERsfjgLvQ22t4vlXj7kmUVvv4dmsToxhQEozT+Ma8y8wgYhptsHPMR+PT1EEWQgfCe8wg MFazMakIu6oFCSTTSA2/aDcd6Ic72ciV2i6oBHKmxL24VlZ5mpGzxD6L5lqTsGcQfzeNEr ax2jhJT7d0TElYP0v/tzn/GA+u3YOMk= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2052.outbound.protection.outlook.com [104.47.1.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-24-VeGNXFpoNLW9OndbsLJFjg-1; Mon, 28 Mar 2022 09:01:06 +0200 X-MC-Unique: VeGNXFpoNLW9OndbsLJFjg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GECDL45iQr+Zbfj6RC8fHCRxO3rlLrXBXvy5dAsCBsyQepPpt/go2m+8gx/mGQ7XYZZA18ubyn64EpcL8uLwYiCCc7u+Ndw5k+MzYGUEBKgAgOHvtBmPfW5/suVNbrSxiNgc4ZVm/PHVSnXS6MZqdiPmdFMhFx1Rjts6qeN4ZoMGbYyVLBVAgjWuOeLE/XVDmfDBZtWvhZmPhM85paGb+l4VsOktO476htYtHC5hbA9zPhwt7xrpEcq37RYWx+WCWBtZ2GMb12A4+yYFRxqpAYrhIv+l8Wvtcdf5Y2F3kWbRgS54dpIDNERqMZm6SnyPW6HpoPBC/1lk5nkA1fK/ww== 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=P+lbxl8jTkI+NdMhwiKhY8hPNvxxELOcuP9C38RJgQw=; b=VjlKGTkNDQalEAyhAcxPVoVbpBnU2NMS8hs9550eGSFqJoBEKHB4v12Utfj9JEbMTZyYp+AP6EUp0SmA+tl453TXWwhTWXqBHgrb47B9OoLok6ZSwgi2cz8Bns7163OUvS/FKKC1vDF1H3Qazz4T83PpIHaxmDT2uK1f87J5Wi61B5VdXc5UAefmGWiNwHLdPKn6czsOcX6dAwk3umAMDj4XSkRVmXGL6lFh5Sv/caAo7Mb5MFXeu7iSn3jhy/OD9uw1yGVO39yPe1Mh1YSeRDsFdzy6+ePTns2nz40+hgCoCdxmYHEygqe+Zf7D1siQO4wiZgRyPccOxiMOnB1TbA== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DU2PR04MB9081.eurprd04.prod.outlook.com (2603:10a6:10:2f0::13) by VI1PR04MB5949.eurprd04.prod.outlook.com (2603:10a6:803:da::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Mon, 28 Mar 2022 07:01:05 +0000 Received: from DU2PR04MB9081.eurprd04.prod.outlook.com ([fe80::2d29:445:cc37:a97f]) by DU2PR04MB9081.eurprd04.prod.outlook.com ([fe80::2d29:445:cc37:a97f%4]) with mapi id 15.20.5102.022; Mon, 28 Mar 2022 07:01:05 +0000 From: Michael Chang To: grub-devel@gnu.org Subject: [PATCH v2 1/3] mkimage: Fix dangling pointer may be used error Date: Mon, 28 Mar 2022 15:00:52 +0800 Message-ID: <20220328070054.13497-2-mchang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328070054.13497-1-mchang@suse.com> References: <20220328070054.13497-1-mchang@suse.com> Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-ClientProxiedBy: HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) To DU2PR04MB9081.eurprd04.prod.outlook.com (2603:10a6:10:2f0::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f83c982-258a-4fbe-459d-08da1088ba26 X-MS-TrafficTypeDiagnostic: VI1PR04MB5949:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UGgFwsCnfG0XNkRwhEAn4+hQDmjhppZ+gFOYj+Xt64yq/GvZncypeQG93nl9wkomyYMOjdt/K4ZQZ+VIkTO4EPHcfj2KXeNQe6+xm29fK69DKLCXI6hqFzaNDfOuMVEul6qrUAudgMZptyBIbhdYZ726sUVG44a3PvcB4wnYGvI12FTLKtYth/3GHzCDVrrkhgfmkgGuMvwg9H9CMpj2GF9jkPR+rA0mLZVgf2aqp9SWtyi9ilTSr/75rWyCiPctrqLt1KPgY8eUfcvjp4CD22w2q5Vg2lI0A3JP6xoGJ0oK5ZZbO3mVFFAUJqFkVTBIDNMYMvHjg/UO1dhjjjfa46dh+iaHPOoAyhlSzSfv8rS54lA2ZMhaCStmc0ViOVP2Ls28p6Na2PhN4agzML/yO6hn99d0DFv9lt01wvhJeYHqr+rhZqWoCYhjByJWyvQr0rPHMLG1G9ZFJKSOVOxf8vnnWv+vXMj6LSS2xnHEfvD/wpaeJFALDl4Tn5HyhwzE7V2bKFZ5OX1/rVpLXUrzSahgtW2pn9H5o7Qz3aJkbjam2eX8YOikwo4bQ/gfSmtci9KVolmnBHLIElQiMYc3+aXL/DEkb7ohE8+rgVfWyGSybdtfoq7B+UiSg01MzVgWTCfGGbQbIzO47/AXgXZHQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB9081.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(66556008)(66476007)(66946007)(1076003)(5660300002)(6486002)(186003)(8676002)(508600001)(83380400001)(6916009)(6666004)(86362001)(316002)(2616005)(6506007)(2906002)(6512007)(8936002)(36756003)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4oJFE/KpfuMB9SVR4zcWpE6vznNIOX7g3nzYGedXta43NaCiWPMj2VepgGNW?= =?us-ascii?Q?aHfacP73tDyZF9LJx9Qe5sXCZe97xCEVduwyi9tSb9rB6ZXEz9lG6R4TVPrE?= =?us-ascii?Q?vDDBtulkBL7EJjiXLJTxfPvow1XA5Ia9doWQoy94OoByh7Txb5jI+s5T21Az?= =?us-ascii?Q?O5zpPrHjrieLKBpVBgf8NqpXS4Vgku7iCiJH/lC8ZaTr94pqiXExo9utUNAu?= =?us-ascii?Q?l7g2DebDL/rqfA8xOXRyF3+rbocnnZvDfbwMJR6RsOi8EeCBkCfmD92406yF?= =?us-ascii?Q?KUR0BZQp1cjoFNLezpgWFRgTAjwMcKhY6wRMiK5/ginaTtKoIroajy0SOcFQ?= =?us-ascii?Q?addA4vrmgUCf7X9h3xbIWSOyNqQsgla7EZSTylpfzjBKrhojQMiB4yq4S4wI?= =?us-ascii?Q?I3R0+M1seYwl9kdINdguiIc6R132fyDDoKg5KQSLi/bd/FAn5SNdFz+L5DaI?= =?us-ascii?Q?Y2/uW4UmXQQR62XvETWKTizG0F9soEHNbdA/81nBX8mhxnVsbJuB5OQz5P6q?= =?us-ascii?Q?qyyfhQZKrjYz4B8/vd/61y9zuhzk+vLlkz/MUQq2tSKqU9yY3tVGDddIflJI?= =?us-ascii?Q?Fk1ac7v3wIhF8OGUrkfFGsgwIkdWgOKQmE08uq4yLX8d/9fkkH6fiVsxAEAb?= =?us-ascii?Q?/pm3hDxNUdpIxEZciT5Vz6ATH/dlvQfkQmzKK9CrktwAIqXLhJ9RYPWyDBMS?= =?us-ascii?Q?OvySekem8dZrgrPJjiQ8CkBTDyAO0cnyI4P8qyEr/NMkGwtR1W7ncf0ECX/+?= =?us-ascii?Q?Jv1m0ZM4/2WUkMQMVzEbXTwZ6NGP++uDmGZNV/f++qvkrGrINS6Kdp7k2VY5?= =?us-ascii?Q?88MTKHmkdp1EvkMUl7I5VytBRNfDnaTz4ldI1wnGagu7j9+P8iuXUz0Tj7NZ?= =?us-ascii?Q?ePMEwrHk5E3nhSBMPAmlxP+84a0LaU0WiKU8jA2iK1G24fXac4klCGJgaLtc?= =?us-ascii?Q?aCikJ9T3iFsE8x8ulJ9TT3aM8pupKbD8WPdiodNeyHo0RcOuyGCHc6SLYrsi?= =?us-ascii?Q?XhFOpE9bl5mwAMH012tytKDZo9LCet8DNS0bqkZb4v7X+rA4OnpAyPcPCiDP?= =?us-ascii?Q?ijyfVL9BurJ8lyFeQrCXjhzwE+B9EIkNFMs4ihmTe++VZOWLNbLr51BN1gmf?= =?us-ascii?Q?GlVa3ai9Qk5Nqeirfh5H/itg+K4zZGTt9z0VPXsdMvorfZMnJWtRVg8g0ite?= =?us-ascii?Q?FZzTQlVbonjqFLg943RECJyffVd07n3JBYS0ilcROsv6HIesz9GbH+KQNasu?= =?us-ascii?Q?R3DlYYVamojk/oTrRgaR6W6Z8aFgTmGjQwUoJKUL36BrBqtOaQpgTH1gzVVb?= =?us-ascii?Q?YG+BKRIu1GOqqLHsNcimpblfjwLZk4M2mXedMMg8AzKimnehtk3FGkcyXVUq?= =?us-ascii?Q?7uCxvMP8mWWwGRLfj8P/ZH8Iiefou4YbW20iOUWdaWhym/ExfLY/IGq+C2SL?= =?us-ascii?Q?SvCTyRVEnIcDLJO4+rBzZidsBVWTyM8S/MhOMcKnLvE4T32/TvHRNVL59Y9U?= =?us-ascii?Q?MMQrWJH/lhWcxEGq7w5zX/Xkvwl6er3fQzCSMcet2WJISR36/Tk5zCvqymbS?= =?us-ascii?Q?xp18K8I62bQhV5GXh6EcljuDVmYN+1iHHrYaKivYZPoxgNVE7PlmUX0K65TA?= =?us-ascii?Q?jeil9dmIBXy7MIW6hqFyQBvW/KQf30ryz5fcgG8qlATGr9oqsLvMjTjBfclY?= =?us-ascii?Q?qSLm2SAWqFUVwIPTrMAl4vix10ePzaZiwh/zCTADhzyGeBm9hlXJ3dwq9W3o?= =?us-ascii?Q?RGc6klmIREh1qepwwWXmbrOohI7guSlpsz/7zk6soC7Hv3uh4PF58U8tmcF0?= X-MS-Exchange-AntiSpam-MessageData-1: T/yOqorBJpZ+UQ== X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f83c982-258a-4fbe-459d-08da1088ba26 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB9081.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2022 07:01:05.2107 (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: zc2JcyYKzI422gk7XeU5d8PD/P9BRaveKbo3vUWEtg4mZLRthhSBbvIJjDDtjcOS X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5949 Received-SPF: pass client-ip=194.104.111.102; envelope-from=mchang@suse.com; helo=de-smtp-delivery-102.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: Mon, 28 Mar 2022 07:01:15 -0000 The warning is real as long as dangling pointer to 'tmp_' may be used if o32 and o64 are both null. However that is not going to happen and can be ignored safely because the PE_OHDR is being used in a context that either o32 or o64 must have been properly initialized. Sadly compiler seems not to always optimize that unused _tmp away so explicit suppression remain needed here. ../util/mkimage.c: In function 'grub_install_generate_image': ../util/mkimage.c:1422:41: error: dangling pointer to 'tmp_' may be used [-= Werror=3Ddangling-pointer=3D] 1422 | PE_OHDR (o32, o64, header_size) =3D grub_host_to_target32 (= header_size); ../util/mkimage.c:857:28: note: 'tmp_' declared here 857 | __typeof__((o64)->field) tmp_; \ | ^~~~ Signed-off-by: Michael Chang Reviewed-by: Daniel Kiper --- util/mkimage.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/util/mkimage.c b/util/mkimage.c index 21c2db7362..43078c71cd 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -1383,6 +1383,10 @@ grub_install_generate_image (const char *dir, const = char *prefix, section =3D (struct grub_pe32_section_table *)(o64 + 1); } =20 +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif PE_OHDR (o32, o64, header_size) =3D grub_host_to_target32 (header_size); PE_OHDR (o32, o64, entry_addr) =3D grub_host_to_target32 (layout.start_ad= dress); PE_OHDR (o32, o64, image_base) =3D 0; @@ -1402,6 +1406,9 @@ grub_install_generate_image (const char *dir, const c= har *prefix, /* The sections. */ PE_OHDR (o32, o64, code_base) =3D grub_host_to_target32 (vma); PE_OHDR (o32, o64, code_size) =3D grub_host_to_target32 (layout.exec_size= ); +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic pop +#endif section =3D init_pe_section (image_target, section, ".text", &vma, layout.exec_size, image_target->section_align, @@ -1411,10 +1418,17 @@ grub_install_generate_image (const char *dir, const= char *prefix, GRUB_PE32_SCN_MEM_READ); =20 scn_size =3D ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_F= ILE_ALIGNMENT); +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif /* ALIGN_UP (sbat_size, GRUB_PE32_FILE_ALIGNMENT) is done earlier. */ PE_OHDR (o32, o64, data_size) =3D grub_host_to_target32 (scn_size + sbat_= size + ALIGN_UP (total_module_size, GRUB_PE32_FILE_ALIGNMENT)); +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic pop +#endif =20 section =3D init_pe_section (image_target, section, ".data", &vma, scn_size, image_target->section_align, @@ -1445,8 +1459,15 @@ grub_install_generate_image (const char *dir, const = char *prefix, } =20 scn_size =3D layout.reloc_size; +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif PE_OHDR (o32, o64, base_relocation_table.rva) =3D grub_host_to_target32 (= vma); PE_OHDR (o32, o64, base_relocation_table.size) =3D grub_host_to_target32 = (scn_size); +#if __GNUC__ >=3D 12 +#pragma GCC diagnostic pop +#endif memcpy (pe_img + raw_data, layout.reloc_section, scn_size); init_pe_section (image_target, section, ".reloc", &vma, scn_size, image_target->section_align, --=20 2.34.1