Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj9H-0007MI-Kf for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:43 -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 1pUj9F-0007Fi-GY for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:41 -0500 Received: from mail-am6eur05on2059.outbound.protection.outlook.com ([40.107.22.59] helo=EUR05-AM6-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 1pUj9D-0006ui-QA for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AJYavtZ85Q4n5KAmqZjtal8ws9pJpuQhvN5zMlKoftMWlbDMMJiUG7H2WWV+oagLT89XLy0Qq1LRJvrV2q+fQE6kMZflbkKnpgVgqAxsRcz0PrFbCjcGfdlgGUrlUxOr8UtNA/bYyFKc90arYQJNvJQltoxWtttz0D7S7GRrXRnSCEOdn6a03JU1+N+5ePunSb7IDCmGxO+3itWgdhCq+0bCpRL5Gti14nF4c1UNSd8wf0Y3Cdswx8Tg8rHqO7CBSEzN3JNXkpSSR6Sb+jC93DXtb+GgK+4jEUvnvNgKo135doOQLJdhjI2mCpQqbqqb6J8DuLO5ZWGlXV0zG+41TA== 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=RkcMAvu2Hp3ynmlZ4pZ0zaZciQ9/dZ51M4rPRIkaVyw=; b=gITwCTt+D3XnQWgVmSmI8aPEBRGjjDXv9/79v232t53b/HIERvelc6eoJEeEhYhAGhQrbgUxkMBgNu+pTSCVEPxfLHZs0i9OnFHLXOgBsW4mALhUocLpFN2s6Mg2xk0/rINGx3R3zyFwGZhxy8CVxU1xCR7kQ4yQyn6XvzmxRmmhTQyiNXk4vUDFvincA6+Pyihnw008LQpQjJSc8AawEoGp9Gtdbe3Ks1eYca1BSCPDnEs+c5q6nx7rBO9SKCKtd5mOQ587T1SjpPK3xI+0FxWxoSsjSMm//OUk21Q19CGuA94rQuMpnCsKUp7cYNDEDuOVzi71GiR+3FfMjNQ/zw== 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=RkcMAvu2Hp3ynmlZ4pZ0zaZciQ9/dZ51M4rPRIkaVyw=; b=ILoKOXey+VeYlJTj0MFXlJ0Bjo3yx8tKCezd/y754h6aw71K1FTNGIBgowbgUydPX+vzHV9epS3IvrZxdOn7EY1fx1KdAVo+uSDDo8WuCirw/p/25TAB8feC4DhpG5p+hWc2+al1BGKdSYTiBXI/2YPYiue8vvmJhVTySNcxc/YN4IhcADoP/M9/FyiZue+3lI3SyvrW3crnBLzHcLm4S4ov3QtlVl1D3Vj2SPSvs10Ni8A7Xe0cEUCu7PUM9W/vW/ZqMGwWrBV6I6Dki1vSndtlOcycmuVLOh6BUYmYkr63NxM0TxDy9uDee+fBExaHWa4qpI9DghjW1TyPl+6kuQ== 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 DBBPR04MB7980.eurprd04.prod.outlook.com (2603:10a6:10:1f0::12) 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:01:55 +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:01:55 +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 11/14] tpm2: check the command parameters of TPM2 commands Date: Wed, 22 Feb 2023 15:00:51 +0800 Message-Id: <20230222070054.5122-12-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: FR0P281CA0007.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::12) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|DBBPR04MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: 17705606-a653-4c13-4e63-08db14a2aebc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l1Jp6lkgfsSFzqfZZLe9EVq7BDCG/0cYlk0VGLaw8t0BExPQnRqukLGBOfEOUOHxIUJV8wqgmf3fWdv4Hv6VfYfjbuZV8+uYDBPkZXyU/noTaUoXplgwKT2OWfFS94vUizy8veTvfMuiJPMu89AO92d3K8zLNgqNdkwjL3Po6ABoybu4kkvoiOrXK6OhTRdUoW7lzkGFWCcdUm5ecSAm0n1nMB+X7yYUY9uFd86Z8tveGHuqosqf1/L+jpr47F1FIzTVrTzgRHa0189NBtH0arb8iHsCLie+B7+EbXgw4pvfdP9kgkZuRNNOUFat4KDNKNtYB5O0xdK23J/kMnYh9BL7WODK9yVaCWHjGIeVtiVLQLDQhLWcGAd4+pNI3oBL4LQWsmVVLYQom53bHgh1A2svbFuIwt9to5DhmGhyg8Ck/t+FQyxkk9sL24eE8B8FR2oMr8aifMGTKQ40/K5QHQFfl6ubj3bkl4bLxxD6r+mn1GAlKWLYO94eG5/TJl6YcQN/DHjqIv4WAd6Lxd0NfntPL8LUfuVlPb+wCW2nVyqUBPA80scAqppzD2J99vBS/E84Lc5aKC+rbjNuHlOYTmXDBdawm/InEYVfeoE7QMvnKgR/lmtsr9kJu82nk9vz6wbLVKANKPgjh+4uHb5ryg== 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)(376002)(396003)(346002)(366004)(39860400002)(136003)(451199018)(316002)(83380400001)(19627235002)(54906003)(478600001)(38100700002)(36756003)(2906002)(86362001)(66946007)(66556008)(66476007)(6916009)(4326008)(8676002)(41300700001)(8936002)(5660300002)(7416002)(2616005)(6486002)(26005)(186003)(6512007)(6506007)(1076003)(107886003)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?biE99mNiAqikBBGnnGi7fnrSA5xNXi3vK/CckyJ0/PG0kU4+Nw6993tWqTp9?= =?us-ascii?Q?/vKKVkEyQvQxAZ+10G06VxkqoyE8Z+8+0fDL0FanEPKs+vyU5pi50e/csKvN?= =?us-ascii?Q?YofRur19TROAHs0Hb5Voti5jhe8dXJQoXrGlhWMQDUJ3wYuRnkMdW4gXCyA7?= =?us-ascii?Q?p7RL93xGhoNeDJWLdBxNjZzVLCRjv8URlWNJlPAVP4mR74W9A42iE9XtvWld?= =?us-ascii?Q?ibFOHTJaBsGf82K05yLZUMBhwxybp5BxFOPq+YT7SSnr2G4tKbOwKDr4Hq/i?= =?us-ascii?Q?doaLgwIA060DLyw9KjuoQyeo6iFhTj1ZJOAMD7YSA7rvrq/IfaPvkBDjo+mw?= =?us-ascii?Q?ci9obXkB02q+bDKfqE96h8IG2wdIvPAdOr6zvyOJxCnh1PxKX0k6GuEVvdjp?= =?us-ascii?Q?F3Qexo6cahOwHh5E0DxWctr+tJNDb0gvc66QyZrt6pJQe5bmQuKRl5jhwNFL?= =?us-ascii?Q?Wiptum8ocdtlSMDwZT7oG/IcvQeI2f9ofsIkl+GEzUaNEcujNtrzaklfHTev?= =?us-ascii?Q?/BSzsEXhJwCqxATu23RaJQ+I7hgHOPYdCIZfLRkSeAl6DPZceAZ0c1latemQ?= =?us-ascii?Q?ofMRIDtgB851hRlcnKePifZ8TUUWdrePEL3k9CPgkOyX5oi6J5YGoVKLYOBM?= =?us-ascii?Q?ForsBr7b1yE9jfbDcIPyMWgBAp+LXbzMrEOOu2ZoPp4gHZkzwBN7aQZCV/Ld?= =?us-ascii?Q?25c50JjlejhcQXxGKLVP/NK1RhwsOs11vjaX7SnVb0dEPvzKZTRpPyycHkGu?= =?us-ascii?Q?qGwru+1NcFUzDe+fgz5+1HGqj/J9BPyMLinoCs721MhaOJsYvi6PEQBS59FL?= =?us-ascii?Q?AHlTzWf4ND6dFPC47OgoDbvfvpH54EEi7pUxQuoVPFLqh+qxCJpky5faKCXc?= =?us-ascii?Q?OvT9ZyhJk3eJKbFi8D5XCyM1ZyWu9MExIGtq4h74OiaRPKtX4cCPnLQ3zRTX?= =?us-ascii?Q?MJ/M7qPV9QgU6vb8DG92YaR6pmgmixzdnoS7qNOMfMMk7OSMC2QT1H3TJDSM?= =?us-ascii?Q?9gQdAXBxEmGtqthOps/T+NveX1f51PPbcVNx3EwKJ/6nH9LPhKk1k0s1hP4p?= =?us-ascii?Q?v39rhaIJU6eZ1UP1R23TQ+RICWVy1+7M0DAaD4rdBi1+Y4XranZk5CnXH319?= =?us-ascii?Q?cQ0dLI27U1R1svbQx51NJngtLOYgCFKOQnZvJVsNqXVCBlOnB5ma9qz16LNx?= =?us-ascii?Q?fTGUCUsAfjNLUfsejRcGtsdRkJujd6MGgtBcFMrmM8MY7YLXBfGPb+E8n3L9?= =?us-ascii?Q?eKEjhPZIlMfbq+I5CREMLFxT23SRe0fxMeOFxhiaoBDLlYeGbRQeD/zBrgYw?= =?us-ascii?Q?v48fHV9stmGQ6Qbol9aS2Vp282+EjigmKkJuLXArPNdbqZ+Kso+IJIhSjKw2?= =?us-ascii?Q?IY9gXso3HKHXvGjoIdVImZKOT4iI9n+U2uKfX7AJO8sg1foz0qZBO3bPCSkx?= =?us-ascii?Q?POmsYZOSl9Xuws/H/Tc267z2hzaodQsL7x3uju4T5/SQbAb+eSeVCoVp5Qlw?= =?us-ascii?Q?SJBewvHojcVlDjmkQLfcvLybfRAFSo8aj56wqe+CFi9FFTHITovHnwh5pe2W?= =?us-ascii?Q?KmfeSB9BfyL+x2GkhCGkrQEruHmEAqrpHrHbL/HS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17705606-a653-4c13-4e63-08db14a2aebc 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:01:55.2984 (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: T8k/DvLvTljtpgUNszypw/qRxBoEbbMnzJzg8b/cuQkIM6j8tGm4ZybEVZxSkcCn X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7980 Received-SPF: pass client-ip=40.107.22.59; envelope-from=GLin@suse.com; helo=EUR05-AM6-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:41 -0000 Some command parameters should not be NULL. Add the conditional check to avoid the potential NULL pointer reference. Besides, for TPM2_StartAuthSession, when 'tpmKey' is 'TPM_RH_NULL', the size of 'encryptedSalt' must be 0 per "TCG TPM2 Part3 Commands". Signed-off-by: Gary Lin --- grub-core/tpm2/tpm2.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/grub-core/tpm2/tpm2.c b/grub-core/tpm2/tpm2.c index bc1d797d4..ad9d52cd4 100644 --- a/grub-core/tpm2/tpm2.c +++ b/grub-core/tpm2/tpm2.c @@ -127,6 +127,9 @@ TPM2_CreatePrimary (const TPMI_RH_HIERARCHY primaryHandle, TPM_RC responseCode; grub_uint32_t parameterSize; + if (!inSensitive || !inPublic || !outsideInfo || !creationPCR) + return TPM_RC_VALUE; + if (!objectHandle) objectHandle = &objectHandleTmp; if (!outPublic) @@ -210,6 +213,13 @@ TPM2_StartAuthSession (const TPMI_DH_OBJECT tpmKey, TPM_RC responseCode; grub_uint32_t param_size; + if (!nonceCaller || !symmetric) + return TPM_RC_VALUE; + + if (tpmKey == TPM_RH_NULL && + (encryptedSalt && encryptedSalt->size != 0)) + return TPM_RC_VALUE; + if (!sessionHandle) sessionHandle = &sessionHandleTmp; if (!nonceTpm) @@ -272,6 +282,9 @@ TPM2_PolicyPCR (const TPMI_SH_POLICY policySessions, TPM_RC responseCode; grub_uint32_t param_size; + if (!pcrs) + return TPM_RC_VALUE; + if (!authResponse) authResponse = &authResponseTmp; @@ -363,6 +376,9 @@ TPM2_Load (const TPMI_DH_OBJECT parent_handle, TPM_RC responseCode; grub_uint32_t param_size; + if (!inPrivate || !inPublic) + return TPM_RC_VALUE; + if (!objectHandle) objectHandle = &objectHandleTmp; if (!name) @@ -506,7 +522,7 @@ TPM2_PCR_Read (const TPMS_AUTH_COMMAND *authCommand, grub_uint32_t parameterSize; if (!pcrSelectionIn) - return TPM_RC_FAILURE; + return TPM_RC_VALUE; if (!pcrUpdateCounter) pcrUpdateCounter = &pcrUpdateCounterTmp; @@ -625,6 +641,9 @@ TPM2_Create (const TPMI_DH_OBJECT parentHandle, TPM_RC rc; grub_uint32_t parameterSize; + if (!inSensitive || !inPublic || !outsideInfo || !creationPCR) + return TPM_RC_VALUE; + if (!outPrivate) outPrivate = &outPrivateTmp; if (!outPublic) -- 2.35.3