vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Measure commands

Browse source 
Measure each command executed by grub, which includes script execution.
This commit is contained in:
Matthew Garrett 2015-08-10 15:27:12 -07:00 committed by Matthew Garrett
parent 2d410729e9
commit b47b5685b5
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
grub-core/script/execute.c
View file

@ -27,6 +27,7 @@
#include <grub/normal.h> #include <grub/normal.h>
#include <grub/extcmd.h> #include <grub/extcmd.h>
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/tpm.h>
/* Max digits for a char is 3 (0xFF is 255), similarly for an int it /* 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. */ is sizeof (int) * 3, and one extra for a possible -ve sign. */
@ -933,8 +934,9 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
grub_err_t ret = 0; grub_err_t ret = 0;
grub_script_function_t func = 0; grub_script_function_t func = 0;
char errnobuf[18]; char errnobuf[18];
char *cmdname; char *cmdname, *cmdstring;
int argc; int argc, offset = 0, cmdlen = 0;
unsigned int i;
char **args; char **args;
int invert; int invert;
struct grub_script_argv argv = { 0, 0, 0 }; struct grub_script_argv argv = { 0, 0, 0 };
@ -943,6 +945,25 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0]) if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
return grub_errno; 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_tpm_measure ((unsigned char *)cmdstring, cmdlen, GRUB_COMMAND_PCR,
cmdstring);
grub_free(cmdstring);
invert = 0; invert = 0;
argc = argv.argc - 1; argc = argv.argc - 1;
args = argv.args + 1; args = argv.args + 1;

1
include/grub/tpm.h
View file

@ -30,6 +30,7 @@
#define GRUB_KERNEL_PCR 10 #define GRUB_KERNEL_PCR 10
#define GRUB_INITRD_PCR 11 #define GRUB_INITRD_PCR 11
#define GRUB_CMDLINE_PCR 12 #define GRUB_CMDLINE_PCR 12
#define GRUB_COMMAND_PCR 13
#define TPM_TAG_RQU_COMMAND 0x00C1 #define TPM_TAG_RQU_COMMAND 0x00C1
#define TPM_ORD_Extend 0x14 #define TPM_ORD_Extend 0x14