Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj8s-0006xj-Qm for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:18 -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 1pUj8k-0006ui-04 for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:10 -0500 Received: from mail-am0eur02on2079.outbound.protection.outlook.com ([40.107.247.79] 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 1pUj8h-0006ot-BS for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:09 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CqW40GdoCH0WHHHDaXD3olpxte8hwHfPwk4dVRqDbHHC3OsQHQp/sY1IefvRO/vQuXkxek7ntrkacNtGIi8/77Q1yQrVzFjCvUycoZ7ozg55h6XxAjyvg69W/rVeSICeCREYoI17tl3Vs6SqxOQEheoWs/jolUpzzvCU69xyS4oun262UBhSv8nGeRHJjoquHN+Bv57M1SMd8ZSlNOEOZl3Ip7/uwiC3m4jr5wr9Vag5KA4FAOZ9KV2xrfc/ybyi5U79gXH0gou0MbSVT/bsKMayXnXI89z/InM/ruNgdCSBWGrCtlRW9UqiZ3A9BKV4RgjAEq4SDE9zXDwX+A/LNQ== 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=CKY2vwHQBGHgc8iY2FueWfnkpCI5CltR9rAO6y6RPDE=; b=in1atcoI1mqWbzCqbX/5dw1DL1Tsbpv36sz6v1CInDl8oRKvXdO4vE1Th75YihKkMoasOCIIwiglHxfn/nCSozWCYykExZmsruk7cz7D1/5Q7Iol7iBHb7GU+wLL3c4vpl31XLt/ee8HDTwYHScyvA8YPlSbqo0TNck2XW2qSwMsxYNvk6Gy82aDV+i+i0eJgrZfao88H5RHsd+aehg5yeA2qb4bvu/xnQB075x8eSEBEc7uFadEhX39Kp8r6+34p1DUvj3uEhEE0TROMXNCokIxBqGm2HOjK3wyQwMbUD4tCvdovQiwWu94vPsx56DA04zflXDbHxPIeQvKMnlwvA== 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=CKY2vwHQBGHgc8iY2FueWfnkpCI5CltR9rAO6y6RPDE=; b=C6QtxhkpekmLdrpToENR4sQWIMJw4DrWbcI5IjSh0cdhSYG1OqZvJwV7a4X4cQaNyNiWdsC40/vfLruIxtdwfUy4tFyZBmvCezTo5EJVd//FN4y3YZSKF7zXd7Cwn3wbTDtGoVdxkBHlIMyuceVsRBIGhn1Y4m+uS0rLW9VZAiOLr0mK5ykYI7ZFtScQFgdlafk1h75eFXg4McvsX8B0vYgXbiETKvad9k08Ze2/kc7PwJAs/1FoTt2BVEm1wqDjBJiYJ0X5dc7kVesW+YL0HPNP9TloUvC6TXsH13u1ZmvMLm7Na+8P401sXJlqi1pJqoOp3PjB7k9BgpKbLING0A== 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 PAXPR04MB9572.eurprd04.prod.outlook.com (2603:10a6:102:24f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 07:02:04 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a%6]) with mapi id 15.20.6111.021; Wed, 22 Feb 2023 07:02:04 +0000 From: Gary Lin To: grub-devel@gnu.org Cc: 'Hernan Gatta ' , 'Daniel Kiper ' , shkhisti@microsoft.com, jaskaran.khurana@microsoft.com, christopher.co@microsoft.com, daniel.mihai@microsoft.com, rharwood@redhat.com, jaredz@redhat.com, development@efficientek.com, jejb@linux.ibm.com, mchang@suse.com Subject: [PATCH 13/14] tpm2: allow some command parameters to be NULL Date: Wed, 22 Feb 2023 15:00:53 +0800 Message-Id: <20230222070054.5122-14-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230222070054.5122-1-glin@suse.com> References: <20230222070054.5122-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR2P281CA0177.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::13) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|PAXPR04MB9572:EE_ X-MS-Office365-Filtering-Correlation-Id: ef813b72-8391-4256-f5ac-08db14a2b42e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i8wU9SvLMOqSm2+woejaAZmbpFCNTnxCfbsyxW8uG1J7rZ2GaDdQobXAdKOCrafl4E8snowqPiGUVY1hkgCQUQk7J89i8nDVOjCaYhqUKaWEio+QYtoElR+3WsYUUUjStz4vamYvKnHrwba9qDGHhn0LU0U2sqyOtbWeFFx1o3Yu5yt/zIu1J78kN1V5FkjTsXYvclYCPS75VOBV5Y228DJIYVw21olXCyUV7D8u02RfYJ2k5Ie0c2hyQs3Tb2Rohx5s5L1QlTfAYsSBS5iJ7BhAYZl5D5c4UJ5qC3C/5Yvy2x6DqwiLv3MWk/L283fa1jJkNyPdU1Mm7WlzmJNLbZOF19Ms8D5VExfjeFoYB9H11t97VAtPYPLVbyeTKScEhjpzbj1c270BIzKa5fPl7JtMBm7sYqWkgYZlDKE98FJtZH5lZHlpOsDzK51QM32BYafNVzhGM6fP/CiZ0XODCbqeHPmSBd/OEpAu9PyPfaA0DzIEMuFQhYolZMqNGzaHsSMyqimMU9z1fXCNunRU4icyfnTAyaUCrMlULOVzfiNo6Agep0RyQNykCUIg8aCoOC1f78dPkXD1orVRhRMEO0MqNM1Vo1xMVmq0TsS8cX2+lfq0oA11+FTXdSOvqxZTRMC+UJzfleZLe01nlogvGVRKDcyFIDczT3+dVN6cTzhi9MAoPaWspF4tX4bvu29X 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:(13230025)(39860400002)(396003)(346002)(376002)(136003)(366004)(451199018)(86362001)(36756003)(186003)(8676002)(26005)(6506007)(1076003)(6512007)(66946007)(4326008)(6916009)(8936002)(66476007)(66556008)(5660300002)(41300700001)(2616005)(316002)(54906003)(6666004)(107886003)(19627235002)(6486002)(478600001)(38100700002)(83380400001)(2906002)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?28jWBcNYphKEjKw+uHUpASYGhqVpP5hdaYIAPo5PaUzjZW1T00A8kxCgutwG?= =?us-ascii?Q?H+1D0TisEYeTbVJgPO/6E0bKgxIS0yGFtUe9CBhOWIqJXlaA4VQEYfPg+Xhb?= =?us-ascii?Q?LuGm2LV7gB3Y4ZGCQHwAQX36GzECD6NNJFYk5WPDAZGlIXWNRqVyEHnOFqdC?= =?us-ascii?Q?ko0dTgqwUIDl7wdsm+ZIf5rCUus+ZOuDhR8+8vREAqg/bQzTjmMXQTNOUJpo?= =?us-ascii?Q?rJRFlCMPuVwL0nItBqv7rRO2tTjsqPcIs46rVHt9Zy+DP4lpKv3n92nD2hYy?= =?us-ascii?Q?UeOMdKM/LQlHL3yU+C2FUPymUcBk6wp3U46OuL85CWzpexvIUwl6yYlrK1hI?= =?us-ascii?Q?jRtkY4aj9jB3X2d/FC1D42keCSf3DgZUmeuaTfxTel7A9W31m1P5uzfHBY5u?= =?us-ascii?Q?znGkb0/WbQgJ7o9wk87DQ046FlzP7VU1mneRIrOsM3uiK/k8wC/yYVWPoUm8?= =?us-ascii?Q?7WwZTN9oFENV+BwaW8NcNrRWCpp9jcwTEyuVSsjilzwWI4KTymAEesMj9d6R?= =?us-ascii?Q?GR6TxqRkrDHCk4dU5nD6KN0ivO7EbYnSQ6d0ARxasy1GezJhDiXTlyiaFftr?= =?us-ascii?Q?wqyTyaxw8Mr7AcyrEprdcXPm2G8OHg6GjTinzI8IKgXdbwk1ljFMxXL+wBh7?= =?us-ascii?Q?3N8FAtXqVrz8i5i1+9pAduIRrdMV/zXC0ph7shwQdWQcXJo0b2tqNDz2/ze+?= =?us-ascii?Q?pOzFbWhLOYpgE0BpLPoSFTx8g77Nh14haaoqFjjUY+APhEYsardIHudokIpu?= =?us-ascii?Q?F075/YfIXjBKj8MJpS6GFu3xxhuyj0HdW7g94WDHHPq0ymKQ68ikRclCbaU6?= =?us-ascii?Q?ID+sOqj46hTQKQdFr32THBTJNadHf/2j8DTxetAjVp+4WGl22ptD16C0+Ya4?= =?us-ascii?Q?GI+90RAwSttZr35F36FppaUeiI9SIOLL+Xpop4+KbPDKsFLSJVrM5Ta2m+bx?= =?us-ascii?Q?j5MJjNnhPCDxc7dvbs9xBFTBT1bNIKWu7ouXLjSQKKYor012w8XgZaACqnCX?= =?us-ascii?Q?oaH0W6d+Pwjiqb4oa1oOd8V7/7KACHswWXh7lo0WAbyVtQyKddUNG3cSaIdb?= =?us-ascii?Q?zZNYg9o/0mRaVkuMzjMQjdjHK7Bi37T74qgHSC8WHNQ5bScHqP7xV7Gv+BAx?= =?us-ascii?Q?yqgExpLwy/cI9cZHqElD78s7jM0zh/dr9sZ61CsVCn9Y0NklpRBP4cJYq2+a?= =?us-ascii?Q?P1HHjgcXVlz0sqy1Fn16AoqnqsTNtScOCVbiratueEGBXXqPJEWfNUsQSLlc?= =?us-ascii?Q?Pd9/uDMVIGSE7N8npvlnuo7MBPKtHhNWdlFp3CjlwuxsrRdykEz+W02egKoP?= =?us-ascii?Q?bIsUp+4Bl95UJglAcTNNshMYS4oTt9eNXCdq0l16HYZzYO53o+4gBG9D0n/W?= =?us-ascii?Q?XQ1PZJznPgihCimMrpVwRvrbFYrtBCkQIjFUSvKWZD8RKim2hZ8iRUndLGDO?= =?us-ascii?Q?p4SJCNKJo1iIRLzRiNpVY01GnPUGsSEsTNohIih9y9U5TiGmxlYkwasWzZ/C?= =?us-ascii?Q?tsF+E20cPP9WvquZ0ojee/KaIjT2RI2YIdQ9OPHwh8GJy6vcOgG6PSgFiYJg?= =?us-ascii?Q?g0AnWz/Y4QRS4qU/QHHCMS0aVc8Mp6XwfKTq31O6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef813b72-8391-4256-f5ac-08db14a2b42e X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 07:02:04.6884 (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: z/FYggUrZc71tMi3LKnrmG992GiR5vQ2g/fbSRN9tu9CH3dOukbg+quITIZgbzcY X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9572 Received-SPF: pass client-ip=40.107.247.79; 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, 22 Feb 2023 07:02:11 -0000 There are some parameters of TPM2 commmands allowing to be empty such as 'encryptedSalt' of 'TPM2_StartAuthSession' and 'pcrDigest' of 'TPM2_PolicyPCR'. Instead of forcing the user of those functions to declare an empty variable, we can just pack a u16 zero to fabricate an empty variable when the user passes NULL for them. This also fixes the potential crash caused by grub_tpm2_protector_srk_recover() that invokes TPM2_PolicyPCR() with a NULL pcrDigest. Signed-off-by: Gary Lin --- grub-core/tpm2/tpm2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/grub-core/tpm2/tpm2.c b/grub-core/tpm2/tpm2.c index 470fe7fc1..d67699a24 100644 --- a/grub-core/tpm2/tpm2.c +++ b/grub-core/tpm2/tpm2.c @@ -238,7 +238,10 @@ TPM2_StartAuthSession (const TPMI_DH_OBJECT tpmKey, if (tag == TPM_ST_SESSIONS) grub_tpm2_mu_TPMS_AUTH_COMMAND_Marshal (&in, authCommand); grub_tpm2_mu_TPM2B_Marshal (&in, nonceCaller->size, nonceCaller->buffer); - grub_tpm2_mu_TPM2B_Marshal (&in, encryptedSalt->size, encryptedSalt->secret); + if (encryptedSalt) + grub_tpm2_mu_TPM2B_Marshal (&in, encryptedSalt->size, encryptedSalt->secret); + else + grub_tpm2_buffer_pack_u16 (&in, 0); grub_tpm2_buffer_pack_u8 (&in, sessionType); grub_tpm2_mu_TPMT_SYM_DEF_Marshal (&in, symmetric); grub_tpm2_buffer_pack_u16 (&in, authHash); @@ -295,7 +298,10 @@ TPM2_PolicyPCR (const TPMI_SH_POLICY policySessions, grub_tpm2_buffer_pack_u32 (&in, policySessions); if (tag == TPM_ST_SESSIONS) grub_tpm2_mu_TPMS_AUTH_COMMAND_Marshal (&in, authCommand); - grub_tpm2_mu_TPM2B_Marshal (&in, pcrDigest->size, pcrDigest->buffer); + if (pcrDigest) + grub_tpm2_mu_TPM2B_Marshal (&in, pcrDigest->size, pcrDigest->buffer); + else + grub_tpm2_buffer_pack_u16 (&in, 0); grub_tpm2_mu_TPML_PCR_SELECTION_Marshal (&in, pcrs); if (in.error) return TPM_RC_FAILURE; -- 2.35.3