Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1m32HU-0003Kk-Kd for mharc-grub-devel@gnu.org; Mon, 12 Jul 2021 16:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m31CI-0007wZ-5m for grub-devel@gnu.org; Mon, 12 Jul 2021 15:02:30 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m31CF-0007VJ-H3 for grub-devel@gnu.org; Mon, 12 Jul 2021 15:02:29 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 16CIXnuC114836 for ; Mon, 12 Jul 2021 15:02:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : mime-version; s=pp1; bh=lEchDunZyg1Xi5Oj+XHn642sEnmm84oYWXqwZxTU5S4=; b=LrUQ1OKw8y1z2J3ANhn+MhNaBeTyWJX3sDpvCAyKSDuEMTRGSAzp0Zegi03w8eUIZGiI bSbzk8jNFPt31Xrv9eCXMmWtjqekTgfENzEFHQiiH8E3yad07+nL8Z+uHXWyKG14V6Fm 9lTFjQGBlp/z0gzF/xN0pNG2tfBZdEUPjpJikh8x0SWN7N40rhgffhyV1kdLBIFQlxlI YmGr+Tv+o5dUQ2S6vgo6vpUcubsWXOR23gCS5vJespzRmXX3lw38RqY8c/7HTjfyx73R kxgXFSe+UM7iZ8NohFeyLjvaoBtNOK+dqijkPo2w1uIYiBKrG60NjukgwvGw5qZu/RRc og== Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0a-001b2d01.pphosted.com with ESMTP id 39qrj0498n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jul 2021 15:02:23 -0400 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 16CIwPpE030201 for ; Mon, 12 Jul 2021 19:02:22 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma04wdc.us.ibm.com with ESMTP id 39q36amtq7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jul 2021 19:02:22 +0000 Received: from b03ledav006.gho.boulder.ibm.com (b03ledav006.gho.boulder.ibm.com [9.17.130.237]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 16CJ2LMQ33161522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Jul 2021 19:02:21 GMT Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1FEBDC6057; Mon, 12 Jul 2021 19:02:21 +0000 (GMT) Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E6065C6067; Mon, 12 Jul 2021 19:02:20 +0000 (GMT) Received: from sbct-2.. (unknown [9.47.158.152]) by b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 12 Jul 2021 19:02:20 +0000 (GMT) From: Stefan Berger To: grub-devel@gnu.org Cc: Stefan Berger Subject: [PATCH] ibmvtpm: Add support for trusted boot using a vTPM 2.0 Date: Mon, 12 Jul 2021 15:02:19 -0400 Message-Id: <20210712190219.208790-1-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.31.1 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: SMZtwiH3k4BqQgnsC26Y4hSfyadbbjja X-Proofpoint-GUID: SMZtwiH3k4BqQgnsC26Y4hSfyadbbjja Content-Transfer-Encoding: 8bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-12_10:2021-07-12, 2021-07-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 suspectscore=0 phishscore=0 spamscore=0 malwarescore=0 bulkscore=0 impostorscore=0 mlxscore=0 clxscore=1011 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107120131 Received-SPF: none client-ip=148.163.156.1; envelope-from=stefanb@linux.vnet.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 12 Jul 2021 16:11:52 -0400 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 19:02:30 -0000 From: Stefan Berger Add support for trusted boot using a vTPM 2.0 on the IBM ieee1275 platform. With this patch grub now measures text and binary data into the TPM's PCRs 8 and 9 in the same way as the x86_64 platform does. This patch requires Daniel Axtens's patches for claiming more memory. Signed-off-by: Stefan Berger --- grub-core/Makefile.core.def | 8 ++ grub-core/commands/ieee1275/ibmvtpm.c | 118 ++++++++++++++++++++++++++ grub-core/kern/ieee1275/ibmvtpm.c | 62 ++++++++++++++ include/grub/ieee1275/ibmvtpm.h | 32 +++++++ 4 files changed, 220 insertions(+) create mode 100644 grub-core/commands/ieee1275/ibmvtpm.c create mode 100644 grub-core/kern/ieee1275/ibmvtpm.c create mode 100644 include/grub/ieee1275/ibmvtpm.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 3f3459b2c..e2a64f8ff 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1166,6 +1166,14 @@ module = { enable = powerpc_ieee1275; }; +module = { + name = tpm; + common = commands/tpm.c; + common = kern/ieee1275/ibmvtpm.c; + ieee1275 = commands/ieee1275/ibmvtpm.c; + enable = powerpc_ieee1275; +}; + module = { name = terminal; common = commands/terminal.c; diff --git a/grub-core/commands/ieee1275/ibmvtpm.c b/grub-core/commands/ieee1275/ibmvtpm.c new file mode 100644 index 000000000..9b06c76d9 --- /dev/null +++ b/grub-core/commands/ieee1275/ibmvtpm.c @@ -0,0 +1,118 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2021 IBM Corporation + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + * + * IBM vTPM support code. + */ + +#include +#include +#include +#include +#include +#include +#include + +static grub_ieee1275_ihandle_t grub_tpm_ihandle; +static grub_uint8_t grub_tpm_version; + +static void grub_ieee1275_tpm_init (grub_ieee1275_ihandle_t *tpm_ihandle) +{ + static int init_called = 0; + + if (!init_called) { + init_called = 1; + grub_ieee1275_open ("/vdevice/vtpm", &grub_tpm_ihandle); + } + + *tpm_ihandle = grub_tpm_ihandle; +} + +static grub_err_t +grub_tpm_get_tpm_version (grub_uint8_t *protocol_version) +{ + static int version_probed = 0; + grub_ieee1275_phandle_t vtpm; + char buffer[20]; + grub_ssize_t buffer_size; + + if (!version_probed) { + version_probed = 1; + if (!grub_ieee1275_finddevice ("/vdevice/vtpm", &vtpm) && + !grub_ieee1275_get_property (vtpm, "compatible", buffer, + sizeof buffer, &buffer_size) && + !grub_strcmp (buffer, "IBM,vtpm20")) { + grub_tpm_version = 2; + } + } + *protocol_version = grub_tpm_version; + + return 0; +} + +static grub_int8_t +grub_tpm_handle_find (grub_ieee1275_ihandle_t *tpm_handle, + grub_uint8_t *protocol_version) +{ + grub_ieee1275_tpm_init (tpm_handle); + if (*tpm_handle == NULL) + return 0; + + grub_tpm_get_tpm_version (protocol_version); + + return 1; +} + +static grub_err_t +grub_tpm2_log_event (grub_ieee1275_ihandle_t tpm_handle, unsigned char *buf, + grub_size_t size, grub_uint8_t pcr, + const char *description) +{ + static int error_displayed; + bool succ; + + succ = grub_ieee1275_ibmvtpm_2hash_ext_log (tpm_handle, + pcr, EV_IPL, + description, + grub_strlen(description) + 1, + buf, size); + if (!succ && !error_displayed) { + error_displayed = 1; + grub_printf("2HASH-EXT-LOG failed: Firmware is likely too old.\n"); + } + + return 0; +} + +grub_err_t +grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr, + const char *description) +{ + grub_ieee1275_ihandle_t tpm_handle; + grub_uint8_t protocol_version = 0; + + /* Absence of a TPM isn't a failure. */ + if (!grub_tpm_handle_find (&tpm_handle, &protocol_version)) + return 0; + + grub_dprintf ("tpm", "log_event, pcr = %d, size = 0x%" PRIxGRUB_SIZE ", %s\n", + pcr, size, description); + + if (protocol_version == 2) + return grub_tpm2_log_event (tpm_handle, buf, size, pcr, description); + + return 0; +} diff --git a/grub-core/kern/ieee1275/ibmvtpm.c b/grub-core/kern/ieee1275/ibmvtpm.c new file mode 100644 index 000000000..525a792b4 --- /dev/null +++ b/grub-core/kern/ieee1275/ibmvtpm.c @@ -0,0 +1,62 @@ +/* ibmvtpm.c - Client interface to access the IBM vTPM */ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2021 IBM Corporation + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#include +#include +#include +#include + +bool +grub_ieee1275_ibmvtpm_2hash_ext_log (grub_uint32_t ihandle, + grub_uint8_t pcrindex, + grub_uint32_t eventtype, + const char *description, + grub_size_t description_size, + void *buf, grub_size_t size) +{ + struct tpm_2hash_ext_log + { + struct grub_ieee1275_common_hdr common; + grub_ieee1275_cell_t method; + grub_ieee1275_cell_t ihandle; + grub_ieee1275_cell_t size; + void *buf; + grub_ieee1275_cell_t description_size; + const char *description; + grub_ieee1275_cell_t eventtype; + grub_ieee1275_cell_t pcrindex; + grub_ieee1275_cell_t catch_result; + grub_ieee1275_cell_t rc; + } + args; + + INIT_IEEE1275_COMMON (&args.common, "call-method", 8, 2); + args.method = (grub_ieee1275_cell_t) "2hash-ext-log"; + args.ihandle = ihandle; + args.pcrindex = pcrindex; + args.eventtype = eventtype; + args.description = description; + args.description_size = description_size; + args.buf = buf; + args.size = (grub_ieee1275_cell_t) size; + + if (IEEE1275_CALL_ENTRY_FN (&args) == -1) + return false; + return !!args.rc; +} diff --git a/include/grub/ieee1275/ibmvtpm.h b/include/grub/ieee1275/ibmvtpm.h new file mode 100644 index 000000000..bde4f9e69 --- /dev/null +++ b/include/grub/ieee1275/ibmvtpm.h @@ -0,0 +1,32 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2021 IBM Corporation + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_IEEE1275_IBMVTPM_HEADER +#define GRUB_IEEE1275_IBMVTPM_HEADER 1 + +#include + +bool EXPORT_FUNC(grub_ieee1275_ibmvtpm_2hash_ext_log) ( + grub_uint32_t ihandle, + grub_uint8_t pcrindex, + grub_uint32_t eventtype, + const char *description, + grub_size_t description_size, + void *buf, grub_size_t size); + +#endif -- 2.31.1