Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj9V-0007R8-B1 for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:59 -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 1pUj9L-0007OL-5L for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:50 -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 1pUj9J-0006ui-5D for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:46 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DehaNBbiM0wJpDbLxuH3a0nB5h0xclX0OMM+5Zs894dz09ZbknrT5OlmShH1+sMZDkgkj/5/BkSIP5B0kKrzRRuPx3EUKtbBUT1fsp/dmmX2n6pMGnJVbz50IPnChw1rNgjc1g/toDiaU4AP+iaHb4VH/PfOsg0woITjr39H6thwoTsK1NmpxJ+ruDPuOjxmbmwMhPCpNgWvf5Z6QKdKSIZ98iWPuXzt6Cttt5rfJxhoRu4n95BljHkE+XWdxYKcSgrjJdp+ukhsfG+sgmX/igWumJVbLDDPYNU6WhkyTfBUbmt73scAJHI8eo7vGyZe6C4ZYHJWfOgTeFAFVq2OqA== 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=R/PCbAYsQ8sM/1u7aaYEVFHjuvZnn216EBDP+DMhp+8=; b=HjEi+5LDJ9oIKDGeafVQpXV+PyexxiErHWGtqgG4MdefHo//qhJeVasRrayYUfJGDzMuB/sUOOFdtWxjjgIzTkBtk5tEOZJBU1M8ucINhDOsy9EWN9jdV1LIgLOt5hdximzWQ+fc3tiukNfVdhR1P/U/AGdMLki77z5n6neG7LMeKzgB/pYbMXjMmUaslJe8iwolX4GkZ+wLGWYZe9IX9sB3u06KNQmk5whuQH0SXLnIFqkXnpusylFbVIuVZ7amqhOYBE0C9Fv4e0B7ZLtDC20+hWfy20UJoHOb3VZxc+y5K/7Lm/2GugcMKidQjKhVi4bE8y0+j13RVuN3djKPYQ== 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=R/PCbAYsQ8sM/1u7aaYEVFHjuvZnn216EBDP+DMhp+8=; b=5f42fmgsgbCmTQqT725yJK6FWxqclwa1cT3uytZO3+b0X5WIxxQ3LKAUCFcnDaAFFXAr4SSmXDa6XV8DFjMYuosLErXNlEL8SeEKW0XpEH+/DXdJwHZppM36687+zQ76gMrVC/hrBVYhHTM8USR+7AA2yQRfvi/lwCWroOnhXRidLxqeeOCsMSqNUJKGWVNUEgNSXEExtSIz9w17jFmkYtqORY0IuAW3WIsTIwPG6YgsVmiRHjDRTXIAU04YeyAYdCPdZKvBIAwnz+vkrrWAuo2R9GqpWfRn3K+EMJU+gYJkNydvA2+fxT1XpJlo8qQCjzJdeoF4ags7HJGUvOGOiQ== 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:50 +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:50 +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 10/14] tpm2: resend the command on TPM_RC_RETRY Date: Wed, 22 Feb 2023 15:00:50 +0800 Message-Id: <20230222070054.5122-11-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: FR0P281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::15) 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: cc6e793e-6288-472b-4241-08db14a2abd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: htRNEViJrhFFrDAP1tEM7MSfMD1w2rR4rYBCHrlBSeRplj6GSm3qUl2Ct/IHgdH4U247sfoT0XnD4/UvFxEN7SbqNPl9q0QXqsWWnpv88iqy6vvjN2A2duuO5enDom+TxGBqdcF24z43KUsuZ8zUljYsPmBghypxMwdbkAASmRKZWPQIfIa3S7PNAhubdYC4Z1S2nY3C254aNWO3mQ2J+243S/7sysI25P/r+i1WoaVv9B4f/WZRwdnwev6YcQZzK/iAtHV18z64sMLaQElFq7ibEhi8eXfwqHLqPP0m/P3kZG3ePYgpzrm/irHdXAXPucVuhmvl9AfrBRMBxTkE7LLb/oGWfhoLGGP2C/AEk6/JjiLT8B3WKmTHipwN69HI1zHQcjS7YDJ9g7W+fmEY31P0nSAS0voAoJEgWfuo27QQUaeqDxvrwJfb3TXLHUx5uvBqhh7I/bkKcV71X58Q3nK0O6zwKfr92kA0vRDaCTPc/mVMeV7qv4/rVnI1zzlD48a3JnI6pqIEfy0ohbNUEqRYl7Umml14KuWgft6iEpJJu+ZCDYkRbz8DOGpzFzvQEnuUwKLki6RwiZBpkn5LEnU/AA8wcNndMfT5Q8j++9Gdd/nDxCT/kwZ3W4ClCstSAtVihWzau4nGcWsfc6FMpA== 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)(54906003)(478600001)(38100700002)(36756003)(2906002)(86362001)(66946007)(66556008)(66476007)(6916009)(4326008)(8676002)(41300700001)(8936002)(5660300002)(7416002)(2616005)(6486002)(26005)(186003)(6512007)(6506007)(1076003)(107886003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FBkmfVNECnhBtXyGUzZFM8EI1D+iRel3NG5j5k2gSNvpb4SOr81m2j1vBcYF?= =?us-ascii?Q?3/Wd3PMxksthMXfv4g3qCTJsup688MWq1hgPDySHZs2PeFPCZMOLF2nex94J?= =?us-ascii?Q?6M2EkRkRhgfWqE8nkSWIIQxSYTNs3SicEbnbHTgFH3MBVnQOUSZg3n5XTxHF?= =?us-ascii?Q?AjWfth4Uwi5AkaUUlZzR0+8RP/6VpXvB6PIztMbj1AWzYV5n1DOWcOFzlCAG?= =?us-ascii?Q?/ROsAmlhv8DpCbvi77qBqDMWVPQ2y4Xr1hJd5ximN80uuUtPpS/rGrISCzMi?= =?us-ascii?Q?SuMoxS8DlmpMLCrjzvwVJDEg8hjYwmFc3GJMrQe+CjUoMtDvXgs68Tz4du0e?= =?us-ascii?Q?6YGCpbrNpqeOR9CFjl5iRr27xN1Dq0meJG6C6osVWRGwIrH+ZPvOnX5eKT8O?= =?us-ascii?Q?VG6T2Pe5R9gyN32Dy+boAZrVAWgDfibyCyir14gaQIyp1THb8mCyQKWBmsEO?= =?us-ascii?Q?FHNm/G09MI60+7zuMbuVzqwQCsMXV9r3B71mPU+1ub4xYFtBox9bG7W1YUkH?= =?us-ascii?Q?75f1SvmCKRmaSMFQwlLjeLobapYtP9u3C8Xl2K91aKeoQaOzdcfz0O6CJpVI?= =?us-ascii?Q?PbQiZciPCNvksLiyNNudTciHXtjssyRMEwVLljbs3ld6rKHUS/DWDkYNPHu3?= =?us-ascii?Q?UPh83vbB2B33Mxzt/c8zG7lpNQ2NHD6w5HXT63zodBNY89ZVYXlt15BYnpuN?= =?us-ascii?Q?ny8ChioaiXYTLiw8bmbOBKmBKBq7ZbVPDddv49Hg6YLzEyMGIa+Sbi2kTn5C?= =?us-ascii?Q?E+tNJVqw7k8liFPyFa8qEjdt9ohor4zu/7vgpGvyy+D4THcg+eALzrGN5WdW?= =?us-ascii?Q?dDojb8hntARYi+Td+mDL2UKMaxFEaVkEusmvM3yPKaKz4iEM9uOJkwpQQ5tb?= =?us-ascii?Q?shZd0x7VuS3LyVXjGwIYTpQcV1jH3EDSrvW6R1kCNf+CR8aDERT2/9ny9Eq4?= =?us-ascii?Q?9pPCyyaE4fXwfAitVgVKhO1Okkmk2Z6dWPuto7+yEYk+9eMyTKBujRWVyX7z?= =?us-ascii?Q?qi0Je9llLwgn1tzNnDy++qMmHi5uRmIJ9DG9TFh+MMH8h+Oe1djpsVl1l/bV?= =?us-ascii?Q?i1S7x8g5w9Rst5V3e8pZHzxx/oudDVeVWhUD72iXrm7GuUoGo1oc7IEldFA4?= =?us-ascii?Q?v7NrhdxmRtLQQ30of/Jb0UuG0PSrnv6dHKMwlTFssZCbaNpruwzDIQ/jG42F?= =?us-ascii?Q?R8T2MwW1/+EdICXOLiM2coY8bVnEVmywupajDjGi/CimD+wcQIMIbIsI5a1/?= =?us-ascii?Q?e9fWfQQuap7KHvJsnKQlKFFKy17chLXMr4zEMpOcRW6feOC/M9Fp06YQQzyu?= =?us-ascii?Q?IcOvj9DAcL0UQ620z4D1GCPT9S6K1WhQyuEgoDevRH2t6lApbLbP+r1AqCae?= =?us-ascii?Q?eUYtWM+p246dWUqed0/cD0UIdD0b2FwZj7sbd7TVTBdiNmXlZpJKGGaKTAeq?= =?us-ascii?Q?0lJSsHaHiElQ/VcEzaS9HyEGyn3siyFDA6EEQpG5nKkj3G1+akPXD35ezFh9?= =?us-ascii?Q?vRn5tTgOW5N1sBndZamF37bReLAebGGwuOLN7n/xRLTzyQS7ZzlMSVuKcakm?= =?us-ascii?Q?Ad5euwsvxGLHAP7VHC0qTn4S+vBDz4kGAVpHedDU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc6e793e-6288-472b-4241-08db14a2abd9 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:50.4550 (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: W7K5+1zZKUhcO6yr6q1PITArOn0C7rr+mgK4g9Yke+KIgW0ZEMryOv0TXLm+DR45 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:54 -0000 Sometimes TPM may return TPM_RC_RETRY for some reason, and the only thing we can do is to send the command again. To avoid pending in the while loop indefinitely, just try to send the command 3 times. Signed-off-by: Gary Lin --- grub-core/tpm2/tpm2.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/grub-core/tpm2/tpm2.c b/grub-core/tpm2/tpm2.c index 6c476ff31..bc1d797d4 100644 --- a/grub-core/tpm2/tpm2.c +++ b/grub-core/tpm2/tpm2.c @@ -25,11 +25,11 @@ #include static TPM_RC -grub_tpm2_submit_command (const TPMI_ST_COMMAND_TAG tag, - const TPM_CC commandCode, - TPM_RC *responseCode, - const struct grub_tpm2_buffer *in, - struct grub_tpm2_buffer *out) +grub_tpm2_submit_command_real (const TPMI_ST_COMMAND_TAG tag, + const TPM_CC commandCode, + TPM_RC *responseCode, + const struct grub_tpm2_buffer *in, + struct grub_tpm2_buffer *out) { grub_err_t err; struct grub_tpm2_buffer buf; @@ -75,6 +75,29 @@ grub_tpm2_submit_command (const TPMI_ST_COMMAND_TAG tag, return TPM_RC_SUCCESS; } +static TPM_RC +grub_tpm2_submit_command (const TPMI_ST_COMMAND_TAG tag, + const TPM_CC commandCode, + TPM_RC *responseCode, + const struct grub_tpm2_buffer *in, + struct grub_tpm2_buffer *out) +{ + TPM_RC err; + int retry_cnt = 0; + + /* Catch TPM_RC_RETRY and send the command again */ + do { + err = grub_tpm2_submit_command_real (tag, commandCode, responseCode, + in, out); + if (*responseCode != TPM_RC_RETRY) + break; + + retry_cnt++; + } while (retry_cnt < 3); + + return err; +} + TPM_RC TPM2_CreatePrimary (const TPMI_RH_HIERARCHY primaryHandle, const TPMS_AUTH_COMMAND *authCommand, -- 2.35.3