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

Merge pull request #10 from mjg59/master

Browse source 
Pass through data from the kernel binary to the kernel
This commit is contained in:
mjg59 2015-06-29 16:36:56 -07:00
commit adf8c776a1
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
grub-core/loader/i386/efi/linux.c
View file

@ -27,6 +27,8 @@
#include <grub/lib/cmdline.h> #include <grub/lib/cmdline.h>
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
#include "../verity-hash.h"
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
static grub_dl_t my_mod; static grub_dl_t my_mod;
@ -288,6 +290,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
linux_cmdline + sizeof (LINUX_IMAGE) - 1, linux_cmdline + sizeof (LINUX_IMAGE) - 1,
lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1)); lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
grub_pass_verity_hash(&lh, linux_cmdline);
lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline; lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline;
handover_offset = lh.handover_offset; handover_offset = lh.handover_offset;

2
grub-core/loader/i386/linux.c
View file

@ -36,6 +36,7 @@
#include <grub/lib/cmdline.h> #include <grub/lib/cmdline.h>
#include <grub/linux.h> #include <grub/linux.h>
#include "verity-hash.h"
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
#ifdef GRUB_MACHINE_PCBIOS #ifdef GRUB_MACHINE_PCBIOS
@ -1016,6 +1017,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
maximal_cmdline_size maximal_cmdline_size
- (sizeof (LINUX_IMAGE) - 1)); - (sizeof (LINUX_IMAGE) - 1));
grub_pass_verity_hash(&lh, linux_cmdline);
len = prot_file_size; len = prot_file_size;
if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno) if (grub_file_read (file, prot_mode_mem, len) != len && !grub_errno)
grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),

25
grub-core/loader/i386/verity-hash.h Normal file
View file

@ -0,0 +1,25 @@
#define VERITY_ARG " verity.usrhash="
#define VERITY_HASH_OFFSET 0x40
#define VERITY_HASH_LENGTH 64
static inline void grub_pass_verity_hash(struct linux_kernel_header *lh,
char *cmdline)
{
char *buf = (char *)lh;
grub_size_t cmdline_len;
int i;
for (i=VERITY_HASH_OFFSET; i<VERITY_HASH_OFFSET + VERITY_HASH_LENGTH; i++)
{
if (buf[i] < '0' || buf[i] > '9') // Not a number
if (buf[i] < 'a' || buf[i] > 'f') // Not a hex letter
return;
}
grub_memcpy (cmdline + grub_strlen(cmdline), VERITY_ARG,
sizeof (VERITY_ARG));
cmdline_len = grub_strlen(cmdline);
grub_memcpy (cmdline + cmdline_len, buf + VERITY_HASH_OFFSET,
VERITY_HASH_LENGTH);
cmdline[cmdline_len + VERITY_HASH_LENGTH] = '\0';
}