From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oW99L-0002og-Cy for mharc-grub-devel@gnu.org; Thu, 08 Sep 2022 00:28:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oW99J-0002o1-Ku for grub-devel@gnu.org; Thu, 08 Sep 2022 00:28:21 -0400 Received: from mail-ve1eur02on0628.outbound.protection.outlook.com ([2a01:111:f400:fe06::628]:30502 helo=EUR02-VE1-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 1oW99G-0008Rc-UG for grub-devel@gnu.org; Thu, 08 Sep 2022 00:28:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eimpxj9MeO9tUOmkL8Efrij+AmUjX6f8lQ6QQkxGzmzvhCUuCeQZZt1iOurBSIYqVPrLkqNxozYAEDG6mCgDcskdlkV7Ooq9wcO/nJDEhJmXVscGkO/qmdu1KSsq1Ci+Ez2UGpcLvghs8d7r1TLRmH4yLITZtqcMDbe+mR9ozd4VFPHUiYoa+ZDCX3iuPLXLml54k+mLIzHmDItSjPBfff5cgh4K9UPQrwkbC9+F2U863YkebzuVVFGi+mqf0VR+KqY2TdXipb3OjJpA9o2jt37xRVu6PFr4BSuyZDh20ZXDwfhdr/EER1AY7mYquTp5607yA185ZFil+y5P08AWoA== 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=gRpyVTz1rU4SDVQy8YzUtiJtuJLQZW1sfjMs8O2Lb0E=; b=J6b5lvwHNFvToTXN8PricM3PEhi7W9rvTrL8Tg9UMnM50YHqsQZNBYCbpybl32U9GYSO7FRl0RMZQgL4pGJgVwkWu0UAA7kbs293LJdckxhtz0ByEM0R7gWL85b2svnhEAiB34YuBJoMhAn/3Q3kA+FpOIDPio9Ha4r0j4t+3TMTUWoxOgFkX6SYvRynGDPgxhjtNKXFlR5o1ycQgPwPU8qd13T4x/58B0W93aDacmFOLPYhlg1GjTbZtsNJBJ7IHvQytT8a9lz+W02yDWW8Ho5u8b8g4Btd1+7a6RjhG6dK9AIv6YaKgaPRbhlR3hdN7KdmPdwgxjxoA4/VlfnH9Q== 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=gRpyVTz1rU4SDVQy8YzUtiJtuJLQZW1sfjMs8O2Lb0E=; b=dq44r14V8NR/k+m1VhV2AYcgCnV9+6uQCqMPZ/kq34y+JuNkpszfy7TYC4RO7VeE46U518Sewv4cCclwizI6adlK5jAdGRKVpr48zKncqKU7ONaOr26VsRk8Iq0sS9hsooD9hW79do05LC/P/keauJHCNWzf522ekmIFy5W4/WMdHQvFqOu/OKqASbhQu1kfCOhdcn4sX2EYXBVCJ1i4iEbA52X84pY97XmlQjlMApWa7vv1wazyhOi/e7Eh7m2y3uSkZcBNvXULjVamaMHwateszLuV4ZF+3vxcYTuQvTZiJCfbXobDrm6s0bNlS8sszjm7ZV3F7g1lCo2a9FjL2Q== 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 DB6PR0401MB2342.eurprd04.prod.outlook.com (2603:10a6:4:4e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Thu, 8 Sep 2022 04:23:12 +0000 Received: from DU2PR04MB9081.eurprd04.prod.outlook.com ([fe80::dde8:aa4e:20d0:c5c7]) by DU2PR04MB9081.eurprd04.prod.outlook.com ([fe80::dde8:aa4e:20d0:c5c7%3]) with mapi id 15.20.5588.018; Thu, 8 Sep 2022 04:23:11 +0000 From: Michael Chang To: The development of GNU GRUB Subject: [PATCH] tpm: Disable tpm verifier if tpm is not present Date: Thu, 8 Sep 2022 12:23:01 +0800 Message-Id: <20220908042301.12515-1-mchang@suse.com> X-Mailer: git-send-email 2.35.3 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TY2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:404:42::20) 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: 9049c976-e9e2-46bd-8c95-08da9151d6fd X-MS-TrafficTypeDiagnostic: DB6PR0401MB2342:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wsJAEyRF1z8kEx9O81SPVvykCuqNQw671nUYiSSErFrzLJs8y52bzqUxTBlMC8bcoGURdzHne9GjGJIu/EF+1lw1XU6NlNGrO4Hdyd2808G5da132yQIb8cNjXOzSGK12F40aermiyxVKGFjXGluvX3RAA1L2Iqq7nCh2lQWd+cb36U0h5XSIRU0Lp/YNsHpAb2OpOFyQmCxRMsNfQ3vwxuBLdk7qkueG2jHgFAmYdnqgZmjPWhTHi2rR3p7UHH8DmcUC6vWUtH0aOwf2kxfM3VZdPtnYtTJs5WhpKFVcwArt9xVdvlhV3AtJ4m7+l4Nzscj8IbKpKiXW1fF841wcMJO5Cj+JShShHMmXXuS8JR7xBSM54Rp87QQkYyh06iE1VAuEjvsDOFf+V31CS6H7EM4DtbiRs9wdFYvesiIiYNpdiOJMlyXW5go7L1uarxEWNYngQdm/jhrAwNHnoilMen/hN1ouvbq0cBbdKJRjRe+ilI7a/zXbwCwHVXY4K+IYv1pJOio49jMTktiLzwVLiwTcGNRZsmc32OHGqPt44lVl7pkcHY1xMcAomUZXcrdrd/x3KB+adegClMS3z4zOphqCkth0JfUpISyWU71HSPFf/R8/bW12aTq9a0xofYfRWkkfv0WbDPE8uGQFsCZ767jZ0PcMAArZ6rGOKdytFi3ZeNCuIhixpajZoVzK5m9sgKHdh/Ag+M++sVVAYcHzw== 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:(13230016)(346002)(136003)(396003)(366004)(39860400002)(376002)(36756003)(66556008)(8676002)(66946007)(316002)(66476007)(86362001)(38100700002)(2616005)(186003)(41300700001)(6506007)(6486002)(6666004)(478600001)(6916009)(6512007)(1076003)(8936002)(2906002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oQUkT4W0g48SuPVMkz4B0/kF5ByKznSCjQ0RRFTXqaMJ0VcdwpVo6mNAHbdm?= =?us-ascii?Q?lzWagPc07O3Ybxcm5S1viMt5W5fVp8y070/pwOHBSm3Moe/yHGA7cKv+oPgP?= =?us-ascii?Q?3/YupO9FFhNXEOX/Bkt/kR1mzm1Atj4ehBMxKe3vWgHWX/vRHAMkHMYi3pzC?= =?us-ascii?Q?e+zZchKHg94I0g6gEikp3+4vElsR/fi+XM4GeGef2ql+P0rBPjYA9fK6ZGjB?= =?us-ascii?Q?NtSDW5GBwjGGLD8HxAmeX4lkl4nX4W0ZkiiS7X7IitG2qWqDZtRZzrBCXAeg?= =?us-ascii?Q?zYeZoobgGNwyTaC0XS2Xw9fUDBgS3ZkIhlJcGbAHXHk50tUax2IZyiZIKT46?= =?us-ascii?Q?Yo7dpypXwGQx8JQSMQKL9nVniic/umyFagTzPclTIMGXITvesYFJZ54tCHUT?= =?us-ascii?Q?/YosIajdlytIGwDVXOQr3JI3r/J2TmG4wfpPRKHd/Dk2V27ScvtFqAOz3XcB?= =?us-ascii?Q?9TRQtRzVLs0Y0LNlz6ppG+RJz0fKbviqiLa2gpuHdjCDCjwG/Y5ibfGuX9Em?= =?us-ascii?Q?Pe8i/8S6MG2UtCSf2pWqs9oSntMB4q9wuc5tYCAxpcDa7Oz2jpqcoPSDx3yo?= =?us-ascii?Q?rrA07wUrNE5jJqixTBb8AWNLeBnKcyUjZI5NkS1qxuznZRRIxEMtfgjAKWRd?= =?us-ascii?Q?wClmRLqdvdym3TWiaTPEtbtKkTqSLPDx1qj+WGyTYmVsaq9c57tlZSBZFgZM?= =?us-ascii?Q?KB4omvogM9iRnxY431fegEns0kv+qDSvQUsA/SwcY2pYWW3PV3/0lR3eaBen?= =?us-ascii?Q?C4lmevAWtwmHthYlnP1bpKy+fQCAOuO4T2nH2dWtT8k+zD/7c/UNE9hyyo/L?= =?us-ascii?Q?hzdoTrc8eWEHhhyAw1A0NzGEqPj4ADugJdxq9i2T8dnukeGmawnCt2P3bMRc?= =?us-ascii?Q?Hmit0xoWwztV4Ip7iHmv5urx3DvHAvbfh8Pym5+1BDHEfPJvVY4RBf3jELyf?= =?us-ascii?Q?C5T0Irshf/1g1lyD9utsViCw8VrWKJAhHlf5aXdGYxZPYqKgfbsvdUcLXogG?= =?us-ascii?Q?T068gNyYU2fUJMUsqADTdGVD8VdAjTQRahfSkjT4Px4Lpuk1TOQmgJlK87Yx?= =?us-ascii?Q?5x4bKHd98jQQVIeYyZtkRaq38150RN9TUMgBlDjuLEGSNrVWJT8ofY1kgyBw?= =?us-ascii?Q?V10Fs1dhL9YbyK2eAGfvl1ZLwo2DtbBLuB1Q0GRB/EFLA+LySIhYKS8fB1Tb?= =?us-ascii?Q?uPSVlx0ag/b4GRxa2TXiXnnXKC0y/3xJOCK1H0/mqXHOqK0QFvokAZOSnazO?= =?us-ascii?Q?EwfYUMS/zRF8AjGrX4/Kskx4xhEwqFdjYQ85oMQ9UeYh1rv1HEM5G89Q9hv+?= =?us-ascii?Q?otXeyNpohPsDbHYVz+G6ILDoWOi2zhxI4tTDV5xhaqnfJPFzyRVGQgLcWBu/?= =?us-ascii?Q?fsYOffw1PJtWnkLLYzVwAtwIAqVCed1zsF5+tXUaruGbJKqWF7k1XCkg+O7x?= =?us-ascii?Q?e/9TlwSPhSDEvCe/+7/A/CtlqvL2w+HPSSVIuev1i0rfw1v25HNeU923bE8G?= =?us-ascii?Q?caVsB9vhJCLnpwOBSntKuNuayoGW4yrJPbSyLoOS3rhB4VR3/ark5+Nx5DcD?= =?us-ascii?Q?dny7lnKLCBjjyJee5fJsN1NMTaZS/G4F7tqIBOjsHSW4zurRkLFl/AidV0dT?= =?us-ascii?Q?04PYxuR+a/sPMJsLvteR3Hfp9+4cUrojIpD0ft5jVvOs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9049c976-e9e2-46bd-8c95-08da9151d6fd X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB9081.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 04:23:11.7445 (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: iMyW1er27pRqVQuXNRqqAeuYYhNvMonk9/f4wqy4vJ8HswAjbiU67eL5y4TB7B2C X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2342 Received-SPF: pass client-ip=2a01:111:f400:fe06::628; envelope-from=MChang@suse.com; helo=EUR02-VE1-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, SPF_HELO_PASS=-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: Thu, 08 Sep 2022 04:28:22 -0000 This helps to prevent out of memory error when reading large files via disablig tpm device as verifier has to read all content into memory in one chunk to measure the hash and extend to tpm. Signed-off-by: Michael Chang --- grub-core/commands/efi/tpm.c | 37 ++++++++++++++++++++++++++++++++++++ grub-core/commands/tpm.c | 4 ++++ include/grub/tpm.h | 1 + 3 files changed, 42 insertions(+) diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c index ae09c1bf8b..4f0011f6f5 100644 --- a/grub-core/commands/efi/tpm.c +++ b/grub-core/commands/efi/tpm.c @@ -287,3 +287,40 @@ grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr, else return grub_tpm2_log_event (tpm_handle, buf, size, pcr, description); } + +int +grub_tpm_present () +{ + grub_efi_handle_t tpm_handle; + grub_efi_uint8_t protocol_version; + + if (!grub_tpm_handle_find (&tpm_handle, &protocol_version)) + return 0; + + if (protocol_version == 1) + { + grub_efi_tpm_protocol_t *tpm; + + tpm = grub_efi_open_protocol (tpm_handle, &tpm_guid, + GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (!tpm) + { + grub_dprintf ("tpm", "Cannot open TPM protocol\n"); + return 0; + } + return grub_tpm1_present (tpm); + } + else + { + grub_efi_tpm2_protocol_t *tpm; + + tpm = grub_efi_open_protocol (tpm_handle, &tpm2_guid, + GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (!tpm) + { + grub_dprintf ("tpm", "Cannot open TPM protocol\n"); + return 0; + } + return grub_tpm2_present (tpm); + } +} diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm.c index 2052c36eab..cb8ed6b949 100644 --- a/grub-core/commands/tpm.c +++ b/grub-core/commands/tpm.c @@ -86,10 +86,14 @@ struct grub_file_verifier grub_tpm_verifier = { GRUB_MOD_INIT (tpm) { + if (!grub_tpm_present()) + return; grub_verifier_register (&grub_tpm_verifier); } GRUB_MOD_FINI (tpm) { + if (!grub_tpm_present()) + return; grub_verifier_unregister (&grub_tpm_verifier); } diff --git a/include/grub/tpm.h b/include/grub/tpm.h index 5c285cbc52..c19fcbd0a6 100644 --- a/include/grub/tpm.h +++ b/include/grub/tpm.h @@ -36,4 +36,5 @@ grub_err_t grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr, const char *description); +int grub_tpm_present (void); #endif -- 2.35.3