[PATCH V3 1/3] verifiers: Verify commands executed by grub

[PATCH V3 1/3] verifiers: Verify commands executed by grub

[Matthew Garrett]

From: Matthew Garrett <mjg59@google.com>

Pass all commands executed by grub to the verifiers layer. Most
verifiers will ignore this, but some (such as the TPM verifier) want to
be able to measure and log each command executed in order to ensure that
the boot state is as expected.

Signed-off-by: Matthew Garrett <mjg59@google.com>
---
 grub-core/script/execute.c | 27 ++++++++++++++++++++++++---
 include/grub/verify.h      |  1 +
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index a8502d907..ee299fd0e 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -27,6 +27,7 @@
 #include <grub/normal.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
+#include <grub/verify.h>
 
 /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
@@ -929,8 +930,9 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_err_t ret = 0;
   grub_script_function_t func = 0;
   char errnobuf[18];
-  char *cmdname;
-  int argc;
+  char *cmdname, *cmdstring;
+  int argc, offset = 0, cmdlen = 0;
+  unsigned int i;
   char **args;
   int invert;
   struct grub_script_argv argv = { 0, 0, 0 };
@@ -939,6 +941,26 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
     return grub_errno;
 
+  for (i = 0; i < argv.argc; i++)
+    {
+      cmdlen += grub_strlen (argv.args[i]) + 1;
+    }
+
+  cmdstring = grub_malloc (cmdlen);
+  if (!cmdstring)
+    {
+      return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+			 N_("cannot allocate command buffer"));
+    }
+
+  for (i = 0; i < argv.argc; i++)
+    {
+      offset += grub_snprintf (cmdstring + offset, cmdlen - offset, "%s ",
+			       argv.args[i]);
+    }
+  cmdstring[cmdlen - 1] = '\0';
+  grub_verify_string (cmdstring, GRUB_VERIFY_COMMAND);
+  grub_free (cmdstring);
   invert = 0;
   argc = argv.argc - 1;
   args = argv.args + 1;
@@ -1163,4 +1185,3 @@ grub_script_execute (struct grub_script *script)
 
   return grub_script_execute_cmd (script->cmd);
 }
-
diff --git a/include/grub/verify.h b/include/grub/verify.h
index 79022b422..460f2e20a 100644
--- a/include/grub/verify.h
+++ b/include/grub/verify.h
@@ -31,6 +31,7 @@ enum grub_verify_string_type
   {
     GRUB_VERIFY_KERNEL_CMDLINE,
     GRUB_VERIFY_MODULE_CMDLINE,
+    GRUB_VERIFY_COMMAND,
   };
 
 struct grub_file_verifier
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog

[PATCH V3 2/3] verifiers: Core TPM support

[Matthew Garrett]

From: Matthew Garrett <mjg59@google.com>

Add support for performing basic TPM measurements. Right now this only
supports extending PCRs statically and only on UEFI. In future we might
want to have some sort of mechanism for choosing which events get logged
to which PCRs, but this seems like a good default policy and we can wait
to see whether anyone  has a use case before adding more complexity.

Signed-off-by: Matthew Garrett <mjg59@google.com>
---
 grub-core/Makefile.core.def    |   7 +
 grub-core/commands/efi/tpm.c   | 333 +++++++++++++++++++++++++++++++++
 grub-core/commands/tpm.c       | 100 ++++++++++
 grub-core/kern/i386/efi/init.c |   1 +
 include/grub/efi/tpm.h         | 199 ++++++++++++++++++++
 include/grub/tpm.h             |  82 ++++++++
 6 files changed, 722 insertions(+)
 create mode 100644 grub-core/commands/efi/tpm.c
 create mode 100644 grub-core/commands/tpm.c
 create mode 100644 include/grub/efi/tpm.h
 create mode 100644 include/grub/tpm.h

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6e2cc8444..a485f9186 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2377,6 +2377,13 @@ module = {
   common = commands/testspeed.c;
 };
 
+module = {
+  name = tpm;
+  common = commands/tpm.c;
+  efi = commands/efi/tpm.c;
+  enable = efi;
+};
+
 module = {
   name = tr;
   common = commands/tr.c;
diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c
new file mode 100644
index 000000000..7d1424fc2
--- /dev/null
+++ b/grub-core/commands/efi/tpm.c
@@ -0,0 +1,333 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2018  Free Software Foundation, Inc.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ *
+ *  EFI TPM support code.
+ */
+
+#include <grub/err.h>
+#include <grub/i18n.h>
+#include <grub/efi/api.h>
+#include <grub/efi/efi.h>
+#include <grub/efi/tpm.h>
+#include <grub/mm.h>
+#include <grub/tpm.h>
+#include <grub/term.h>
+
+typedef TCG_PCR_EVENT grub_tpm_event_t;
+
+static grub_efi_guid_t tpm_guid = EFI_TPM_GUID;
+static grub_efi_guid_t tpm2_guid = EFI_TPM2_GUID;
+
+static grub_efi_handle_t *grub_tpm_handle;
+static grub_uint8_t grub_tpm_version;
+
+static grub_int8_t tpm1_present = -1;
+static grub_int8_t tpm2_present = -1;
+
+static grub_efi_boolean_t
+grub_tpm1_present (grub_efi_tpm_protocol_t * tpm)
+{
+  grub_efi_status_t status;
+  TCG_EFI_BOOT_SERVICE_CAPABILITY caps;
+  grub_uint32_t flags;
+  grub_efi_physical_address_t eventlog, lastevent;
+
+  if (tpm1_present != -1)
+    return (grub_efi_boolean_t) tpm1_present;
+
+  caps.Size = (grub_uint8_t) sizeof (caps);
+
+  status = efi_call_5 (tpm->status_check, tpm, &caps, &flags, &eventlog,
+		       &lastevent);
+
+  if (status != GRUB_EFI_SUCCESS || caps.TPMDeactivatedFlag
+      || !caps.TPMPresentFlag)
+    return tpm1_present = 0;
+
+  return tpm1_present = 1;
+}
+
+static grub_efi_boolean_t
+grub_tpm2_present (grub_efi_tpm2_protocol_t * tpm)
+{
+  grub_efi_status_t status;
+  EFI_TCG2_BOOT_SERVICE_CAPABILITY caps;
+
+  caps.Size = (grub_uint8_t) sizeof (caps);
+
+  if (tpm2_present != -1)
+    return (grub_efi_boolean_t) tpm2_present;
+
+  status = efi_call_2 (tpm->get_capability, tpm, &caps);
+
+  if (status != GRUB_EFI_SUCCESS || !caps.TPMPresentFlag)
+    return tpm2_present = 0;
+
+  return tpm2_present = 1;
+}
+
+static grub_efi_boolean_t
+grub_tpm_handle_find (grub_efi_handle_t * tpm_handle,
+		      grub_efi_uint8_t * protocol_version)
+{
+  grub_efi_handle_t *handles;
+  grub_efi_uintn_t num_handles;
+
+  if (grub_tpm_handle != NULL)
+    {
+      *tpm_handle = &grub_tpm_handle;
+      *protocol_version = grub_tpm_version;
+      return 1;
+    }
+
+  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &tpm_guid, NULL,
+				    &num_handles);
+  if (handles && num_handles > 0)
+    {
+      grub_tpm_handle = handles[0];
+      *tpm_handle = handles[0];
+      grub_tpm_version = 1;
+      *protocol_version = 1;
+      return 1;
+    }
+
+  handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL, &tpm2_guid, NULL,
+				    &num_handles);
+  if (handles && num_handles > 0)
+    {
+      grub_tpm_handle = handles[0];
+      *tpm_handle = handles[0];
+      grub_tpm_version = 2;
+      *protocol_version = 2;
+      return 1;
+    }
+
+  return 0;
+}
+
+static grub_err_t
+grub_tpm1_execute (grub_efi_handle_t tpm_handle,
+                   PassThroughToTPM_InputParamBlock * inbuf,
+                   PassThroughToTPM_OutputParamBlock * outbuf)
+{
+  grub_efi_status_t status;
+  grub_efi_tpm_protocol_t *tpm;
+  grub_uint32_t inhdrsize = sizeof (*inbuf) - sizeof (inbuf->TPMOperandIn);
+  grub_uint32_t outhdrsize =
+    sizeof (*outbuf) - sizeof (outbuf->TPMOperandOut);
+
+  tpm = grub_efi_open_protocol (tpm_handle, &tpm_guid,
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+  if (!grub_tpm1_present (tpm))
+    return 0;
+
+  /* UEFI TPM protocol takes the raw operand block, no param block header */
+  status = efi_call_5 (tpm->pass_through_to_tpm, tpm,
+		       inbuf->IPBLength - inhdrsize, inbuf->TPMOperandIn,
+		       outbuf->OPBLength - outhdrsize, outbuf->TPMOperandOut);
+
+  switch (status)
+    {
+    case GRUB_EFI_SUCCESS:
+      return 0;
+    case GRUB_EFI_DEVICE_ERROR:
+      return grub_error (GRUB_ERR_IO, N_("Command failed"));
+    case GRUB_EFI_INVALID_PARAMETER:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Invalid parameter"));
+    case GRUB_EFI_BUFFER_TOO_SMALL:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			 N_("Output buffer too small"));
+    case GRUB_EFI_NOT_FOUND:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+    default:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+    }
+}
+
+static grub_err_t
+grub_tpm2_execute (grub_efi_handle_t tpm_handle,
+                   PassThroughToTPM_InputParamBlock * inbuf,
+                   PassThroughToTPM_OutputParamBlock * outbuf)
+{
+  grub_efi_status_t status;
+  grub_efi_tpm2_protocol_t *tpm;
+  grub_uint32_t inhdrsize = sizeof (*inbuf) - sizeof (inbuf->TPMOperandIn);
+  grub_uint32_t outhdrsize =
+    sizeof (*outbuf) - sizeof (outbuf->TPMOperandOut);
+
+  tpm = grub_efi_open_protocol (tpm_handle, &tpm2_guid,
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+  if (!grub_tpm2_present (tpm))
+    return 0;
+
+  /* UEFI TPM protocol takes the raw operand block, no param block header */
+  status = efi_call_5 (tpm->submit_command, tpm,
+		       inbuf->IPBLength - inhdrsize, inbuf->TPMOperandIn,
+		       outbuf->OPBLength - outhdrsize, outbuf->TPMOperandOut);
+
+  switch (status)
+    {
+    case GRUB_EFI_SUCCESS:
+      return 0;
+    case GRUB_EFI_DEVICE_ERROR:
+      return grub_error (GRUB_ERR_IO, N_("Command failed"));
+    case GRUB_EFI_INVALID_PARAMETER:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Invalid parameter"));
+    case GRUB_EFI_BUFFER_TOO_SMALL:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			 N_("Output buffer too small"));
+    case GRUB_EFI_NOT_FOUND:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+    default:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+    }
+}
+
+grub_err_t
+grub_tpm_execute (PassThroughToTPM_InputParamBlock * inbuf,
+		  PassThroughToTPM_OutputParamBlock * outbuf)
+{
+  grub_efi_handle_t tpm_handle;
+  grub_uint8_t protocol_version;
+
+  /* Absence of a TPM isn't a failure */
+  if (!grub_tpm_handle_find (&tpm_handle, &protocol_version))
+    return 0;
+
+  if (protocol_version == 1)
+    return grub_tpm1_execute (tpm_handle, inbuf, outbuf);
+  else
+    return grub_tpm2_execute (tpm_handle, inbuf, outbuf);
+}
+
+static grub_err_t
+grub_tpm1_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
+		     grub_size_t size, grub_uint8_t pcr,
+		     const char *description)
+{
+  grub_tpm_event_t *event;
+  grub_efi_status_t status;
+  grub_efi_tpm_protocol_t *tpm;
+  grub_efi_physical_address_t lastevent;
+  grub_uint32_t algorithm;
+  grub_uint32_t eventnum = 0;
+
+  tpm = grub_efi_open_protocol (tpm_handle, &tpm_guid,
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+  if (!grub_tpm1_present (tpm))
+    return 0;
+
+  event = grub_zalloc (sizeof (*event) + grub_strlen (description) + 1);
+  if (!event)
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+		       N_("cannot allocate TPM event buffer"));
+
+  event->PCRIndex = pcr;
+  event->EventType = EV_IPL;
+  event->EventSize = grub_strlen (description) + 1;
+  grub_memcpy (event->Event, description, event->EventSize);
+
+  algorithm = TCG_ALG_SHA;
+  status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
+		       algorithm, event, &eventnum, &lastevent);
+
+  switch (status)
+    {
+    case GRUB_EFI_SUCCESS:
+      return 0;
+    case GRUB_EFI_DEVICE_ERROR:
+      return grub_error (GRUB_ERR_IO, N_("Command failed"));
+    case GRUB_EFI_INVALID_PARAMETER:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Invalid parameter"));
+    case GRUB_EFI_BUFFER_TOO_SMALL:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			 N_("Output buffer too small"));
+    case GRUB_EFI_NOT_FOUND:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+    default:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+    }
+}
+
+static grub_err_t
+grub_tpm2_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
+		     grub_size_t size, grub_uint8_t pcr,
+		     const char *description)
+{
+  EFI_TCG2_EVENT *event;
+  grub_efi_status_t status;
+  grub_efi_tpm2_protocol_t *tpm;
+
+  tpm = grub_efi_open_protocol (tpm_handle, &tpm2_guid,
+				GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
+  if (!grub_tpm2_present (tpm))
+    return 0;
+
+  event =
+    grub_zalloc (sizeof (EFI_TCG2_EVENT) + grub_strlen (description) + 1);
+  if (!event)
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+		       N_("cannot allocate TPM event buffer"));
+
+  event->Header.HeaderSize = sizeof (EFI_TCG2_EVENT_HEADER);
+  event->Header.HeaderVersion = 1;
+  event->Header.PCRIndex = pcr;
+  event->Header.EventType = EV_IPL;
+  event->Size =
+    sizeof (*event) - sizeof (event->Event) + grub_strlen (description) + 1;
+  grub_memcpy (event->Event, description, grub_strlen (description) + 1);
+
+  status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
+		       (grub_uint64_t) size, event);
+
+  switch (status)
+    {
+    case GRUB_EFI_SUCCESS:
+      return 0;
+    case GRUB_EFI_DEVICE_ERROR:
+      return grub_error (GRUB_ERR_IO, N_("Command failed"));
+    case GRUB_EFI_INVALID_PARAMETER:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("Invalid parameter"));
+    case GRUB_EFI_BUFFER_TOO_SMALL:
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			 N_("Output buffer too small"));
+    case GRUB_EFI_NOT_FOUND:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("TPM unavailable"));
+    default:
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("Unknown TPM error"));
+    }
+}
+
+grub_err_t
+grub_tpm_log_event (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
+		    const char *description)
+{
+  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)
+    return grub_tpm1_log_event (tpm_handle, buf, size, pcr, description);
+  else
+    return grub_tpm2_log_event (tpm_handle, buf, size, pcr, description);
+}
diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm.c
new file mode 100644
index 000000000..1e7fdd760
--- /dev/null
+++ b/grub-core/commands/tpm.c
@@ -0,0 +1,100 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2018  Free Software Foundation, Inc.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ *
+ *  Core TPM support code.
+ */
+
+#include <grub/err.h>
+#include <grub/i18n.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/tpm.h>
+#include <grub/term.h>
+#include <grub/verify.h>
+#include <grub/dl.h>
+
+GRUB_MOD_LICENSE ("GPLv3+") grub_err_t
+grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
+		  const char *description)
+{
+  return grub_tpm_log_event (buf, size, pcr, description);
+}
+
+static grub_err_t
+grub_tpm_verify_init (grub_file_t io,
+		      enum grub_file_type type __attribute__ ((unused)),
+		      void **context, enum grub_verify_flags *flags)
+{
+  *context = io->name;
+  *flags |= GRUB_VERIFY_FLAGS_SINGLE_CHUNK;
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_tpm_verify_write (void *context, void *buf, grub_size_t size)
+{
+  return grub_tpm_measure (buf, size, GRUB_BINARY_PCR, context);
+}
+
+static grub_err_t
+grub_tpm_verify_string (char *str, enum grub_verify_string_type type)
+{
+  const char *prefix = NULL;
+  char *description;
+  grub_err_t status;
+
+  switch (type)
+    {
+    case GRUB_VERIFY_KERNEL_CMDLINE:
+      prefix = "kernel_cmdline: ";
+      break;
+    case GRUB_VERIFY_MODULE_CMDLINE:
+      prefix = "module_cmdline: ";
+      break;
+    case GRUB_VERIFY_COMMAND:
+      prefix = "grub_cmd: ";
+      break;
+    }
+  description = grub_malloc (grub_strlen (str) + grub_strlen (prefix) + 1);
+  if (!description)
+    return grub_errno;
+  grub_memcpy (description, prefix, grub_strlen (prefix));
+  grub_memcpy (description + grub_strlen (prefix), str,
+	       grub_strlen (str) + 1);
+  status =
+    grub_tpm_measure ((unsigned char *) str, grub_strlen (str),
+		      GRUB_STRING_PCR, description);
+  grub_free (description);
+  return status;
+}
+
+struct grub_file_verifier grub_tpm_verifier = {
+  .name = "tpm",
+  .init = grub_tpm_verify_init,
+  .write = grub_tpm_verify_write,
+  .verify_string = grub_tpm_verify_string,
+};
+
+GRUB_MOD_INIT (tpm)
+{
+  grub_verifier_register (&grub_tpm_verifier);
+}
+
+GRUB_MOD_FINI (tpm)
+{
+  grub_verifier_unregister (&grub_tpm_verifier);
+}
diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
index a28316cc6..da499aba0 100644
--- a/grub-core/kern/i386/efi/init.c
+++ b/grub-core/kern/i386/efi/init.c
@@ -27,6 +27,7 @@
 #include <grub/efi/efi.h>
 #include <grub/i386/tsc.h>
 #include <grub/loader.h>
+#include <grub/tpm.h>
 
 void
 grub_machine_init (void)
diff --git a/include/grub/efi/tpm.h b/include/grub/efi/tpm.h
new file mode 100644
index 000000000..d4a70445d
--- /dev/null
+++ b/include/grub/efi/tpm.h
@@ -0,0 +1,199 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2018  Free Software Foundation, Inc.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_EFI_TPM_HEADER
+#define GRUB_EFI_TPM_HEADER 1
+
+#define EFI_TPM_GUID {0xf541796d, 0xa62e, 0x4954, {0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd }};
+#define EFI_TPM2_GUID {0x607f766c, 0x7455, 0x42be, {0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f }};
+
+#define TCG_ALG_SHA 0x00000004
+
+/* These structs are as defined in the TCG EFI Protocol Specification,
+   family 2.0. */
+
+struct _TCG_VERSION
+{
+  grub_efi_uint8_t Major;
+  grub_efi_uint8_t Minor;
+  grub_efi_uint8_t RevMajor;
+  grub_efi_uint8_t RevMinor;
+};
+typedef struct _TCG_VERSION TCG_VERSION;
+
+struct _TCG_EFI_BOOT_SERVICE_CAPABILITY
+{
+  /* Size of this structure */
+  grub_efi_uint8_t Size;
+  TCG_VERSION      StructureVersion;
+  TCG_VERSION      ProtocolSpecVersion;
+  /* Hash algorithms supported by this TPM */
+  grub_efi_uint8_t HashAlgorithmBitmap;
+  /* 1 if TPM present */
+  char             TPMPresentFlag;
+  /* 1 if TPM deactivated */
+  char             TPMDeactivatedFlag;
+};
+typedef struct _TCG_EFI_BOOT_SERVICE_CAPABILITY TCG_EFI_BOOT_SERVICE_CAPABILITY;
+
+struct tdTCG_PCR_EVENT
+{
+  grub_efi_uint32_t PCRIndex;
+  grub_efi_uint32_t EventType;
+  grub_efi_uint8_t  digest[20];
+  grub_efi_uint32_t EventSize;
+  grub_efi_uint8_t  Event[1];
+};
+typedef struct tdTCG_PCR_EVENT TCG_PCR_EVENT;
+
+struct grub_efi_tpm_protocol
+{
+  grub_efi_status_t (*status_check) (struct grub_efi_tpm_protocol * this,
+				     TCG_EFI_BOOT_SERVICE_CAPABILITY *
+				     ProtocolCapability,
+				     grub_efi_uint32_t * TCGFeatureFlags,
+				     grub_efi_physical_address_t *
+				     EventLogLocation,
+				     grub_efi_physical_address_t *
+				     EventLogLastEntry);
+  grub_efi_status_t (*hash_all) (struct grub_efi_tpm_protocol * this,
+				 grub_efi_uint8_t * HashData,
+				 grub_efi_uint64_t HashLen,
+				 grub_efi_uint32_t AlgorithmId,
+				 grub_efi_uint64_t * HashedDataLen,
+				 grub_efi_uint8_t ** HashedDataResult);
+  grub_efi_status_t (*log_event) (struct grub_efi_tpm_protocol * this,
+				  TCG_PCR_EVENT * TCGLogData,
+				  grub_efi_uint32_t * EventNumber,
+				  grub_efi_uint32_t Flags);
+  grub_efi_status_t (*pass_through_to_tpm) (struct grub_efi_tpm_protocol *
+					    this,
+					    grub_efi_uint32_t
+					    TpmInputParameterBlockSize,
+					    grub_efi_uint8_t *
+					    TpmInputParameterBlock,
+					    grub_efi_uint32_t
+					    TpmOutputParameterBlockSize,
+					    grub_efi_uint8_t *
+					    TpmOutputParameterBlock);
+  grub_efi_status_t (*log_extend_event) (struct grub_efi_tpm_protocol * this,
+					 grub_efi_physical_address_t HashData,
+					 grub_efi_uint64_t HashDataLen,
+					 grub_efi_uint32_t AlgorithmId,
+					 TCG_PCR_EVENT * TCGLogData,
+					 grub_efi_uint32_t * EventNumber,
+					 grub_efi_physical_address_t *
+					 EventLogLastEntry);
+};
+
+typedef struct grub_efi_tpm_protocol grub_efi_tpm_protocol_t;
+
+typedef grub_efi_uint32_t EFI_TCG2_EVENT_LOG_BITMAP;
+typedef grub_efi_uint32_t EFI_TCG2_EVENT_LOG_FORMAT;
+typedef grub_efi_uint32_t EFI_TCG2_EVENT_ALGORITHM_BITMAP;
+
+struct tdEFI_TCG2_VERSION
+{
+  grub_efi_uint8_t Major;
+  grub_efi_uint8_t Minor;
+} GRUB_PACKED;
+typedef struct tdEFI_TCG2_VERSION EFI_TCG2_VERSION;
+
+struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY
+{
+  grub_efi_uint8_t                Size;
+  EFI_TCG2_VERSION                StructureVersion;
+  EFI_TCG2_VERSION                ProtocolVersion;
+  EFI_TCG2_EVENT_ALGORITHM_BITMAP HashAlgorithmBitmap;
+  EFI_TCG2_EVENT_LOG_BITMAP       SupportedEventLogs;
+  grub_efi_boolean_t              TPMPresentFlag;
+  grub_efi_uint16_t               MaxCommandSize;
+  grub_efi_uint16_t               MaxResponseSize;
+  grub_efi_uint32_t               ManufacturerID;
+  grub_efi_uint32_t               NumberOfPcrBanks;
+  EFI_TCG2_EVENT_ALGORITHM_BITMAP ActivePcrBanks;
+};
+typedef struct tdEFI_TCG2_BOOT_SERVICE_CAPABILITY EFI_TCG2_BOOT_SERVICE_CAPABILITY;
+
+typedef grub_efi_uint32_t TCG_PCRINDEX;
+typedef grub_efi_uint32_t TCG_EVENTTYPE;
+
+struct tdEFI_TCG2_EVENT_HEADER
+{
+  grub_efi_uint32_t HeaderSize;
+  grub_efi_uint16_t HeaderVersion;
+  TCG_PCRINDEX      PCRIndex;
+  TCG_EVENTTYPE     EventType;
+} GRUB_PACKED;
+typedef struct tdEFI_TCG2_EVENT_HEADER EFI_TCG2_EVENT_HEADER;
+
+struct tdEFI_TCG2_EVENT
+{
+  grub_efi_uint32_t     Size;
+  EFI_TCG2_EVENT_HEADER Header;
+  grub_efi_uint8_t      Event[1];
+} GRUB_PACKED;
+typedef struct tdEFI_TCG2_EVENT EFI_TCG2_EVENT;
+
+struct grub_efi_tpm2_protocol
+{
+  grub_efi_status_t (*get_capability) (struct grub_efi_tpm2_protocol * this,
+				       EFI_TCG2_BOOT_SERVICE_CAPABILITY *
+				       ProtocolCapability);
+  grub_efi_status_t (*get_event_log) (struct grub_efi_tpm2_protocol * this,
+				      EFI_TCG2_EVENT_LOG_FORMAT
+				      EventLogFormat,
+				      grub_efi_physical_address_t *
+				      EventLogLocation,
+				      grub_efi_physical_address_t *
+				      EventLogLastEntry,
+				      grub_efi_boolean_t * EventLogTruncated);
+  grub_efi_status_t (*hash_log_extend_event) (struct grub_efi_tpm2_protocol *
+					      this, grub_efi_uint64_t Flags,
+					      grub_efi_physical_address_t *
+					      DataToHash,
+					      grub_efi_uint64_t DataToHashLen,
+					      EFI_TCG2_EVENT * EfiTcgEvent);
+  grub_efi_status_t (*submit_command) (struct grub_efi_tpm2_protocol * this,
+				       grub_efi_uint32_t
+				       InputParameterBlockSize,
+				       grub_efi_uint8_t * InputParameterBlock,
+				       grub_efi_uint32_t
+				       OutputParameterBlockSize,
+				       grub_efi_uint8_t *
+				       OutputParameterBlock);
+  grub_efi_status_t (*get_active_pcr_blanks) (struct grub_efi_tpm2_protocol *
+					      this,
+					      grub_efi_uint32_t *
+					      ActivePcrBanks);
+  grub_efi_status_t (*set_active_pcr_banks) (struct grub_efi_tpm2_protocol *
+					     this,
+					     grub_efi_uint32_t
+					     ActivePcrBanks);
+  grub_efi_status_t (*get_result_of_set_active_pcr_banks) (struct
+							   grub_efi_tpm2_protocol
+							   * this,
+							   grub_efi_uint32_t *
+							   OperationPresent,
+							   grub_efi_uint32_t *
+							   Response);
+};
+
+typedef struct grub_efi_tpm2_protocol grub_efi_tpm2_protocol_t;
+
+#endif
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
new file mode 100644
index 000000000..6a8a80225
--- /dev/null
+++ b/include/grub/tpm.h
@@ -0,0 +1,82 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2018  Free Software Foundation, Inc.
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_TPM_HEADER
+#define GRUB_TPM_HEADER 1
+
+#define GRUB_STRING_PCR 8
+#define GRUB_BINARY_PCR 9
+
+#define SHA1_DIGEST_SIZE 20
+
+#define TPM_BASE     0x0
+#define TPM_SUCCESS  TPM_BASE
+#define TPM_AUTHFAIL (TPM_BASE + 0x1)
+#define TPM_BADINDEX (TPM_BASE + 0x2)
+
+#define TPM_TAG_RQU_COMMAND 0x00C1
+#define TPM_ORD_Extend 0x14
+
+#define EV_IPL 0x0d
+
+/* TCG_PassThroughToTPM Input Parameter Block */
+typedef struct
+{
+  grub_uint16_t IPBLength;
+  grub_uint16_t Reserved1;
+  grub_uint16_t OPBLength;
+  grub_uint16_t Reserved2;
+  grub_uint8_t  TPMOperandIn[1];
+} GRUB_PACKED PassThroughToTPM_InputParamBlock;
+
+/* TCG_PassThroughToTPM Output Parameter Block */
+typedef struct
+{
+  grub_uint16_t OPBLength;
+  grub_uint16_t Reserved;
+  grub_uint8_t  TPMOperandOut[1];
+} GRUB_PACKED PassThroughToTPM_OutputParamBlock;
+
+typedef struct
+{
+  grub_uint16_t tag;
+  grub_uint32_t paramSize;
+  grub_uint32_t ordinal;
+  grub_uint32_t pcrNum;
+  /* The 160 bit value representing the event to be recorded. */
+  grub_uint8_t  inDigest[SHA1_DIGEST_SIZE];
+} GRUB_PACKED ExtendIncoming;
+
+/* TPM_Extend Outgoing Operand */
+typedef struct
+{
+  grub_uint16_t tag;
+  grub_uint32_t paramSize;
+  grub_uint32_t returnCode;
+  /* The PCR value after execution of the command. */
+  grub_uint8_t  outDigest[SHA1_DIGEST_SIZE];
+} GRUB_PACKED ExtendOutgoing;
+
+grub_err_t grub_tpm_measure (unsigned char *buf, grub_size_t size,
+			     grub_uint8_t pcr, const char *description);
+grub_err_t grub_tpm_init (void);
+grub_err_t grub_tpm_execute (PassThroughToTPM_InputParamBlock * inbuf,
+			     PassThroughToTPM_OutputParamBlock * outbuf);
+grub_err_t grub_tpm_log_event (unsigned char *buf, grub_size_t size,
+			       grub_uint8_t pcr, const char *description);
+#endif
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog

[PATCH V3 3/3] verifiers: Add TPM documentation

[Matthew Garrett]

Describe the behaviour of grub when the TPM module is in use.

Signed-off-by: Matthew Garrett <mjg59@google.com>
---
 docs/grub.texi | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/docs/grub.texi b/docs/grub.texi
index 471d97c95..6bd3783a4 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5545,6 +5545,7 @@ environment variables and commands are listed in the same order.
 * Authentication and authorisation:: Users and access control
 * Using digital signatures::         Booting digitally signed code
 * UEFI secure boot and shim::        Booting digitally signed PE files
+* Measured Boot::                    Measuring boot components
 @end menu
 
 @node Authentication and authorisation
@@ -5721,6 +5722,43 @@ mentioned requirements are enforced by the shim_lock module. And itself it
 is a persistent module which means that it cannot be unloaded if it was
 loaded into the memory.
 
+@node Measured Boot
+@section Measuring boot components
+
+If the tpm module is loaded and the platform has a Trusted Platform Module
+installed, GRUB will log each command executed and each file loaded into the
+TPM event log and extend the PCR values in the TPM correspondingly. All events
+will be logged into the PCR described below with a type of EV_IPL and an
+event description as described below.
+
+@multitable @columnfractions 0.3 0.1 0.6
+@headitem Event type @tab PCR @tab Description
+@item Command
+@tab 8
+@tab All executed commands (including those from configuration files) will be
+logged and measured as entered with a prefix of ``grub_cmd: ``
+@item Module command line
+@tab 8
+@tab Any command line passed to a kernel module will be logged and measured as
+entered with a prefix of ``module_cmdline: ``
+@item Kernel command line
+@tab 8
+@tab Any command line passed to a kernel will be logged and measured as entered
+with a prefix of ``kernel_cmdline: ''
+@item Files
+@tab 9
+@tab Any file read by GRUB will be logged and measured with a descriptive text
+corresponding to the filename.
+@end multitable
+
+GRUB will not measure its own @file{core.img} - it is expected that firmware
+will carry this out. GRUB will also not perform any measurements until the
+tpm module is loaded. As such it is recommended that the tpm module be built
+into @file{core.img} in order to avoid a potential gap in measurement between
+@file{core.img} being loaded and the tpm module being loaded.
+
+Measured boot is currently only supported on EFI platforms.
+
 @node Platform limitations
 @chapter Platform limitations
 
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog

Re: [PATCH V3 1/3] verifiers: Verify commands executed by grub

[Daniel Kiper]

On Thu, Nov 29, 2018 at 11:28:08AM -0800, Matthew Garrett wrote:
> From: Matthew Garrett <mjg59@google.com>
>
> Pass all commands executed by grub to the verifiers layer. Most
> verifiers will ignore this, but some (such as the TPM verifier) want to
> be able to measure and log each command executed in order to ensure that
> the boot state is as expected.
>
> Signed-off-by: Matthew Garrett <mjg59@google.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

Re: [PATCH V3 2/3] verifiers: Core TPM support

[Daniel Kiper]

On Thu, Nov 29, 2018 at 11:28:09AM -0800, Matthew Garrett wrote:
> From: Matthew Garrett <mjg59@google.com>
>
> Add support for performing basic TPM measurements. Right now this only
> supports extending PCRs statically and only on UEFI. In future we might
> want to have some sort of mechanism for choosing which events get logged
> to which PCRs, but this seems like a good default policy and we can wait
> to see whether anyone  has a use case before adding more complexity.
>
> Signed-off-by: Matthew Garrett <mjg59@google.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

Re: [PATCH V3 3/3] verifiers: Add TPM documentation

[Daniel Kiper]

On Thu, Nov 29, 2018 at 11:28:10AM -0800, Matthew Garrett wrote:
> Describe the behaviour of grub when the TPM module is in use.
>
> Signed-off-by: Matthew Garrett <mjg59@google.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

If there are no objections I will apply the patch series in a week or so.

Thank you for doing the work.

Daniel

Re: [PATCH V3 3/3] verifiers: Add TPM documentation

[Daniel Kiper]

On Mon, Dec 03, 2018 at 03:48:17PM +0100, Daniel Kiper wrote:
> On Thu, Nov 29, 2018 at 11:28:10AM -0800, Matthew Garrett wrote:
> > Describe the behaviour of grub when the TPM module is in use.
> >
> > Signed-off-by: Matthew Garrett <mjg59@google.com>
>
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
>
> If there are no objections I will apply the patch series in a week or so.

Pushed. However, I have had to change "enable = efi;" to "enable = x86_64_efi;"
in grub-core/Makefile.core.def. Otherwise ARM EFI builds would be broken.
I hope that this is not a problem for you.

Daniel

Re: [PATCH V3 3/3] verifiers: Add TPM documentation

[Matthew Garrett]

On Wed, Dec 12, 2018 at 6:31 AM Daniel Kiper <dkiper@net-space.pl> wrote:
>
> On Mon, Dec 03, 2018 at 03:48:17PM +0100, Daniel Kiper wrote:
> > On Thu, Nov 29, 2018 at 11:28:10AM -0800, Matthew Garrett wrote:
> > > Describe the behaviour of grub when the TPM module is in use.
> > >
> > > Signed-off-by: Matthew Garrett <mjg59@google.com>
> >
> > Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
> >
> > If there are no objections I will apply the patch series in a week or so.
>
> Pushed. However, I have had to change "enable = efi;" to "enable = x86_64_efi;"
> in grub-core/Makefile.core.def. Otherwise ARM EFI builds would be broken.
> I hope that this is not a problem for you.

Hmm, this should have been architecture independent - what was the
failure? I can send a followup patch to fix that up.

Re: [PATCH V3 3/3] verifiers: Add TPM documentation

[Daniel Kiper]

On Wed, Dec 12, 2018 at 09:57:48AM -0800, Matthew Garrett wrote:
> On Wed, Dec 12, 2018 at 6:31 AM Daniel Kiper <dkiper@net-space.pl> wrote:
> >
> > On Mon, Dec 03, 2018 at 03:48:17PM +0100, Daniel Kiper wrote:
> > > On Thu, Nov 29, 2018 at 11:28:10AM -0800, Matthew Garrett wrote:
> > > > Describe the behaviour of grub when the TPM module is in use.
> > > >
> > > > Signed-off-by: Matthew Garrett <mjg59@google.com>
> > >
> > > Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
> > >
> > > If there are no objections I will apply the patch series in a week or so.
> >
> > Pushed. However, I have had to change "enable = efi;" to "enable = x86_64_efi;"
> > in grub-core/Makefile.core.def. Otherwise ARM EFI builds would be broken.
> > I hope that this is not a problem for you.
>
> Hmm, this should have been architecture independent - what was the
> failure? I can send a followup patch to fix that up.

Please see below. As you can see all non x86_64 EFI builds fail. Failures look the same.

******************************************************************************

./configure --target=aarch64-linux-gnu --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"

[...]

aarch64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=ARM64_EFI -nostdinc -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -freg-struct-return -mgeneral-regs-only -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-PIE -fno-pie -fno-stack-protector -Wtrampolines -Werror -mcmodel=large  -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
In file included from commands/efi/tpm.c:23:0:
commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long unsigned int}’ but argument is of type ‘unsigned char *’
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long unsigned int *}’ but argument is of type  unsigned char *’
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
cc1: all warnings being treated as errors

******************************************************************************

./configure --target=arm-linux-gnueabihf --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"

[...]

arm-linux-gnueabihf-gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=ARM_EFI -nostdinc -isystem /usr/lib/gcc-cross/arm-linux-gnueabihf/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -freg-struct-return -msoft-float -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -fno-unwind-tables -mthumb-interwork -Qn -fno-PIE -fno-pie -fno-stack-protector -mno-unaligned-access -Wtrampolines -Werror   -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
In file included from commands/efi/tpm.c:23:0:
commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long long unsigned int}’ but argument is of type ‘unsigned char *’
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long long unsigned int *}’ but argument is of type ‘unsigned char *’
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
cc1: all warnings being treated as errors

******************************************************************************

./configure --target=i386 --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"

[...]

gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem /usr/lib/gcc/x86_64-linux-gnu/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-PIE -fno-pie -fno-stack-protector -Wtrampolines -Werror   -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
In file included from commands/efi/tpm.c:23:0:
commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long long unsigned int}’ but argument is of type ‘unsigned char *’
   status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
                                                    ^
../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
 #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
                                                       ^
commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long long unsigned int *}’ but argument is of type ‘unsigned char *’
   status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
                                                            ^
../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
 #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
                                                    ^
cc1: all warnings being treated as errors

******************************************************************************

Daniel

Re: [PATCH V3 3/3] verifiers: Add TPM documentation

[Daniel Kiper]

On Mon, Dec 17, 2018 at 03:47:20PM +0100, Daniel Kiper wrote:
> On Wed, Dec 12, 2018 at 09:57:48AM -0800, Matthew Garrett wrote:
> > On Wed, Dec 12, 2018 at 6:31 AM Daniel Kiper <dkiper@net-space.pl> wrote:
> > >
> > > On Mon, Dec 03, 2018 at 03:48:17PM +0100, Daniel Kiper wrote:
> > > > On Thu, Nov 29, 2018 at 11:28:10AM -0800, Matthew Garrett wrote:
> > > > > Describe the behaviour of grub when the TPM module is in use.
> > > > >
> > > > > Signed-off-by: Matthew Garrett <mjg59@google.com>
> > > >
> > > > Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
> > > >
> > > > If there are no objections I will apply the patch series in a week or so.
> > >
> > > Pushed. However, I have had to change "enable = efi;" to "enable = x86_64_efi;"
> > > in grub-core/Makefile.core.def. Otherwise ARM EFI builds would be broken.
> > > I hope that this is not a problem for you.
> >
> > Hmm, this should have been architecture independent - what was the
> > failure? I can send a followup patch to fix that up.
>
> Please see below. As you can see all non x86_64 EFI builds fail. Failures look the same.
>
> ******************************************************************************
>
> ./configure --target=aarch64-linux-gnu --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"
>
> [...]
>
> aarch64-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=ARM64_EFI -nostdinc -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -freg-struct-return -mgeneral-regs-only -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-PIE -fno-pie -fno-stack-protector -Wtrampolines -Werror -mcmodel=large  -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
> In file included from commands/efi/tpm.c:23:0:
> commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
> commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long unsigned int}’ but argument is of type ‘unsigned char *’
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
> commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long unsigned int *}’ but argument is of type  unsigned char *’
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> cc1: all warnings being treated as errors
>
> ******************************************************************************
>
> ./configure --target=arm-linux-gnueabihf --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"
>
> [...]
>
> arm-linux-gnueabihf-gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=ARM_EFI -nostdinc -isystem /usr/lib/gcc-cross/arm-linux-gnueabihf/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -freg-struct-return -msoft-float -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -fno-unwind-tables -mthumb-interwork -Qn -fno-PIE -fno-pie -fno-stack-protector -mno-unaligned-access -Wtrampolines -Werror   -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
> In file included from commands/efi/tpm.c:23:0:
> commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
> commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long long unsigned int}’ but argument is of type ‘unsigned char *’
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
> commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long long unsigned int *}’ but argument is of type ‘unsigned char *’
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> cc1: all warnings being treated as errors
>
> ******************************************************************************
>
> ./configure --target=i386 --with-platform=efi --enable-grub-mkfont --prefix="`pwd`/grub-dist"
>
> [...]
>
> gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem /usr/lib/gcc/x86_64-linux-gnu/6/include -I../include -I../include -DGRUB_FILE=\"commands/efi/tpm.c\" -I. -I. -I.. -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-PIE -fno-pie -fno-stack-protector -Wtrampolines -Werror   -ffreestanding   -MT commands/efi/tpm_module-tpm.o -MD -MP -MF commands/efi/.deps-core/tpm_module-tpm.Tpo -c -o commands/efi/tpm_module-tpm.o `test -f 'commands/efi/tpm.c' || echo './'`commands/efi/tpm.c
> In file included from commands/efi/tpm.c:23:0:
> commands/efi/tpm.c: In function ‘grub_tpm1_log_event’:
> commands/efi/tpm.c:248:52: error: passing argument 2 of ‘tpm->log_extend_event’ makes integer from pointer without a cast [-Werror=int-conversion]
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c:248:52: note: expected ‘grub_efi_physical_address_t {aka long long unsigned int}’ but argument is of type ‘unsigned char *’
>    status = efi_call_7 (tpm->log_extend_event, tpm, buf, (grub_uint64_t) size,
>                                                     ^
> ../include/grub/efi/api.h:1698:55: note: in definition of macro ‘efi_call_7’
>  #define efi_call_7(func, a, b, c, d, e, f, g) func(a, b, c, d, e, f, g)
>                                                        ^
> commands/efi/tpm.c: In function ‘grub_tpm2_log_event’:
> commands/efi/tpm.c:298:60: error: passing argument 3 of ‘tpm->hash_log_extend_event’ from incompatible pointer type [-Werror=incompatible-pointer-types]
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> commands/efi/tpm.c:298:60: note: expected ‘grub_efi_physical_address_t * {aka long long unsigned int *}’ but argument is of type ‘unsigned char *’
>    status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, buf,
>                                                             ^
> ../include/grub/efi/api.h:1696:52: note: in definition of macro ‘efi_call_5’
>  #define efi_call_5(func, a, b, c, d, e) func(a, b, c, d, e)
>                                                     ^
> cc1: all warnings being treated as errors
>
> ******************************************************************************

Ping?

Daniel