Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj8x-000703-1k for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:23 -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 1pUj8e-0006tn-EM for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:05 -0500 Received: from mail-am6eur05on2057.outbound.protection.outlook.com ([40.107.22.57] 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 1pUj8c-0006lx-P0 for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ej/uBJ3AkIEwHDpIc9S3SZiUBr7DV5IrRBxTdFFm+g+9Xqg/C2cbG3CunBfIbp1n4iIYQlzP0gxdw+j2q3XHZhp9/K9W5lsMMI4jl+Sh64oA78SiLT5GGeD8PKnH5DouAKknMvoUNREwDbILrVyo4M2MkBaaE4Lo4LlVYGfz51ZXbtaxm34CeOyiSeVJFo855cy8qbG/NstRlOS63USl2vQaw9tEFycY3YokbyLNHl3yOcZMNbYWZcUXZumgcs9Ltr2UyIzsd2qKjwxa8zg1HAmK6JeeR8K9X4p3A3CNx1JoueFoeqO3UjSUy/Np8l9lc6zQKC14P3U4LJxzuTmwgA== 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=RifET2I2SyXfWbdXuL6rJcOtUjIo+jvK51a0ira3B4U=; b=HCYrJU+cjXT6p2c/mnVX2v8EFdQlM2Pt1N4ablh266+NyjBWswaxwMwEp9SMMQvGFfdnUb69LNW23RYjkTTrTjad1Zxe9U2JWQZVKVquvzqjIWNuhrM6fLmPgIHwb7HmvjUjr2dIL9cXNuHBoIQbC3ITC1szp0m8eyD8kzRE9YgSnAdde5EtypUjpmQiQD34on5ABqMaBFP4JPzTimOyhv7epKp4WNBCIw8eQpoqQCFQPenqzcOc8NJ7q/H2J7IgfLAx3KZQocKLs7jv3AHL+YHKiEIprCnnC0IbjmXSR+QYRIB09MB4jQFwVtx0nzcWtCaYxoTEG87Mx5Cj7NYDnw== 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=RifET2I2SyXfWbdXuL6rJcOtUjIo+jvK51a0ira3B4U=; b=GzHKdr+9NFFRF5IuxPzcW6QekmfFTJSA74QHbenFjF/u4uBsEqCpOkU/4TzBxjRzoYzLMVwLkAeND7KmbLO5zrAXVNnfieVJXBAvfdawsCmzQE5FRZgojOhh4RNHR//RFLxqd7Y1mAk002lXTEu5ol1Da6MxsMbfK+K/o78Z9HhsAiabtGB/FXHKc/OFrwmhLdKGdq4guMMee0Gje+EKETNMt6LyvCjB2v9qLtZe2qc4p2LB2RrYZ+ZireeiXXF7b+m60Xn01ltCvRGnShV2BxV8BaKc21RRjfXVr0jA5bx2nVYy6uiBmyu4JYGyaNaLZD6CY/EZ3085G+uKTB8z9Q== 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:40 +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:40 +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 08/14] tpm2: adjust the input parameters of TPM2_EvictControl Date: Wed, 22 Feb 2023 15:00:48 +0800 Message-Id: <20230222070054.5122-9-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: FR3P281CA0184.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::19) 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: 7426b402-dae5-41df-8e7b-08db14a2a5f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OK+jXBRmXoal5oMr8mayb52PoR2dLdGV8nfSIfTD1dXFiYxHnuKizij4pE9zjrciD4f5CspTS/ly88iVhnT9VDe0zEpYC5LjpNqmBqFtMvuW8wKHyVwOP3i3x1dWB21rTEGv4+yPJKaKKKIO37PwO+NziTVI0yUwC16CLgVThxLBQIOuuhcdEuet32V8/jTNnzRbUVJgTaAvzVcx8+5MOQ6sG6GmmJpjc41NiFctJo01QnOUjr3XL0LnKC06ASoeKDv4Ebkt6AO1Jd/BX4Fc3NeHgXT8QusDSE1KU5lVDUw6J64ZDxvJZnBIGiRTJHrB24TtE4wm/t1trQ0aW6Ld7O8do9uALB8+JidP59ne5bvqvNbRGA4flJOPQI/ekWvzHVShHigqg8J/iTtlOnD5BfuKQdFHLB7R71G7gq94/iGMLupUHY7ZDs8KGbmcp2o3bkX+3M1z6zc1Q5/J6GGrDoD+u+s5Dk0TMIgrdOJo9puTXez8ZcxU497RrwA9ZhqJHosiQs4TacSyj/RVHwsRKaatuFBha82JhGP6y1FZzdWo0y72cdvMrpTLiyB7m273+ULByX8oeAtKoT89NZWzkjbra/2f5osxXakOg6NdvcpgnHTA3p5Clx7s+UPSU8JYhgW9vPjo1zT5QaXWJEWw/g== 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?kJbOBFBNbGazLMLiAYjQKDdJCvsi1BeLlxprbsq9DUjXf5GycPSDk/WuBh2q?= =?us-ascii?Q?g26Nok90prdcH80pQ3t2D8cI3pI/hzo4Os+hewRwlqePbgInhtKreSUar02p?= =?us-ascii?Q?7VsoCHxQSldJp9Cl7P7TVTWUavFb71LOokKJzKWdW0cJg49L74tc8isoF0b/?= =?us-ascii?Q?P5HIZOdbEwckGTUgNyDi+4uzEgpZ84Nyleo4edzqGNdtOA5gryHNO4C69G7t?= =?us-ascii?Q?+cD71abzN/X07teD/gkksx+ooz+wdxKnydiqQAgtWV4mh6uZqD7d+z/JLAP0?= =?us-ascii?Q?4SVyYBHbos1+kAlt0dTkEX/d6EYAA/YalLPRGtTTiq1F/7plX73spg+FA2of?= =?us-ascii?Q?Gt/pYVKxrqdfQkBRZeevZ6RDVQo3jBUU974bREQ67C46TjF6jdJN3NqP727P?= =?us-ascii?Q?rRviE8/HzCO/b9XIpHVjIPR4aHp/qZDpxgpFWmEQs4PSgWrXb/x7X/mDnQc1?= =?us-ascii?Q?5Eo0hl4tRu5HduTdJcCR57W0C8apzO1Hv+SvYmjRinRsOd1FvR+XKbezaxiw?= =?us-ascii?Q?XcCY5/2PzyVM2oKMQkyy2/ZOAz1BKDr23zsYIPBkmVa7xUt5g/89OCXT60ln?= =?us-ascii?Q?eSVdVK5Gr0Kh66wdeOLKRgv+HKtthQQFtO0Kwm7/oKcVkgYABqoso43VfJtB?= =?us-ascii?Q?lSaOZX0wCJSShs8OjAdRZL9vUcbS/9qqKWeCrhjshw7w0w2u1SuDeOsuqrHE?= =?us-ascii?Q?o4QGb4vyzRSf76PinaqE69FWM9lS56rUhtZQ41lE2/c4QCroo0qJ/jPBqjSR?= =?us-ascii?Q?CSSaPtAYCZzX9JmkI5r3SQMH4im1fr9se7Km0OOuy4lGBGVbHR1ZUvHpI82o?= =?us-ascii?Q?wQWWP4rbmbAooUETpvz+TYLzE4lII6QWE0BdNez/AD+guz/jrEw5AsAkpwuc?= =?us-ascii?Q?8kU1AGs0DLB0qnf3mIqXsrp2XA52Q4lcgNbIn4PgE5KajPU2e34zB+l8BC8L?= =?us-ascii?Q?jiBqMOLDJE/Yw/5VlJy+2d9kSr0nBxs6VP4H/CiLmH/W5b4fr3v6vlheESA5?= =?us-ascii?Q?KKDQBKiGrW/lKW3k5R50a7QEMPjdEdDhrvMvEu0Tu8ZZ501KCwJrsUvNytOH?= =?us-ascii?Q?rY6obcjATTK9yiDxTwj8mU+/RmBi3YXAela/QU2JsnCZAIyxofRL2DqvZsPP?= =?us-ascii?Q?7iNaQsQ+bb3IAl3jg3TzRZ9eLwQVmQ0acJjuN5X5sw0v+TyFQ2XJBmz1VXZ4?= =?us-ascii?Q?L4FFverni9RgHo8KyanzB+bNzFHynkZNYyP1tSnPCb6XtyBr6Zajwh4PHIdr?= =?us-ascii?Q?i28jHgazaW/5+bA4ovutc8GNuZOUWTVmOfzWUo00MWYqa3kSYsJtsa7/Wfum?= =?us-ascii?Q?tXEKRPJwuNhBzh9Cqyt0XgZ4XP6s8jzE0uExITEZVDnlEthMCJsC2gP7dpb/?= =?us-ascii?Q?Zz6dUaz6hD3gdrTmytpnScKfDtwIPLP/Vq7RYn3tC2vqVBWdghfY0DZo06VP?= =?us-ascii?Q?v/vvdUYm825TIkK9p3d2qqgpKuUYlaoczORXAg99Ss2LhkNpa4u9VOALCIib?= =?us-ascii?Q?r1WkYOWh0c9nkezySMMzKQSXVNCFLpE178tiPCksb+yqEzsWMEO5r0gmr+vd?= =?us-ascii?Q?Q83LB2BRGDogy6rabQfBWfBUaTZfcNlwPYq35Zsa?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7426b402-dae5-41df-8e7b-08db14a2a5f6 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:40.8775 (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: BlBP4FSd94NCy8WJ04yijz+sxJdGNfMECOqqjthwy/kOegWtdQRlzo2/UQNORGuT X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7980 Received-SPF: pass client-ip=40.107.22.57; 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:06 -0000 Per "TCG TPM2 Part3 Commands", 'persistentHandle' of TPM2_EvictControl is in the parameter area, i.e. after the authorization command. Adjust the order of the arguments to match the spec definition. Signed-off-by: Gary Lin --- grub-core/tpm2/tpm2.c | 2 +- include/grub/tpm2/internal/functions.h | 2 +- util/grub-protect.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grub-core/tpm2/tpm2.c b/grub-core/tpm2/tpm2.c index 7baa4c6e5..85bd4ef23 100644 --- a/grub-core/tpm2/tpm2.c +++ b/grub-core/tpm2/tpm2.c @@ -662,8 +662,8 @@ TPM2_Create (TPMI_DH_OBJECT parentHandle, TPM_RC TPM2_EvictControl (TPMI_RH_PROVISION auth, TPMI_DH_OBJECT objectHandle, - TPMI_DH_PERSISTENT persistentHandle, const TPMS_AUTH_COMMAND *authCommand, + TPMI_DH_PERSISTENT persistentHandle, TPMS_AUTH_RESPONSE *authResponse) { struct grub_tpm2_buffer in; diff --git a/include/grub/tpm2/internal/functions.h b/include/grub/tpm2/internal/functions.h index 9d5823975..f88ea2dfe 100644 --- a/include/grub/tpm2/internal/functions.h +++ b/include/grub/tpm2/internal/functions.h @@ -110,8 +110,8 @@ TPM2_Create (TPMI_DH_OBJECT parentHandle, TPM_RC TPM2_EvictControl (TPMI_RH_PROVISION auth, TPMI_DH_OBJECT objectHandle, - TPMI_DH_PERSISTENT persistentHandle, const TPMS_AUTH_COMMAND *authCommand, + TPMI_DH_PERSISTENT persistentHandle, TPMS_AUTH_RESPONSE *authResponse); #endif /* ! GRUB_TPM2_INTERNAL_FUNCTIONS_HEADER */ diff --git a/util/grub-protect.c b/util/grub-protect.c index acd30642f..f0f27af0a 100644 --- a/util/grub-protect.c +++ b/util/grub-protect.c @@ -695,8 +695,8 @@ grub_protect_tpm2_get_srk (struct grub_protect_args *args, TPM_HANDLE *srk) /* Persist SRK */ if (args->tpm2_persist) { - rc = TPM2_EvictControl (TPM_RH_OWNER, srkHandle, args->tpm2_srk, - &authCommand, NULL); + rc = TPM2_EvictControl (TPM_RH_OWNER, srkHandle, &authCommand, + args->tpm2_srk, NULL); if (rc == TPM_RC_SUCCESS) { TPM2_FlushContext (srkHandle); @@ -877,8 +877,8 @@ grub_protect_tpm2_remove (struct grub_protect_args *args) /* Evict SRK */ authCommand.sessionHandle = TPM_RS_PW; - rc = TPM2_EvictControl (TPM_RH_OWNER, args->tpm2_srk, args->tpm2_srk, - &authCommand, NULL); + rc = TPM2_EvictControl (TPM_RH_OWNER, args->tpm2_srk, &authCommand, + args->tpm2_srk, NULL); if (rc != TPM_RC_SUCCESS) { fprintf (stderr, -- 2.35.3