2021-03-30 15:50:09 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
Date: Thu, 14 Mar 2019 19:45:17 +0100
|
|
|
|
|
Subject: [PATCH] verifiers: PowerPC fallout cleanup
|
|
|
|
|
|
|
|
|
|
PowerPC fallout cleanup after commit 4d4a8c96e (verifiers: Add possibility
|
|
|
|
|
to verify kernel and modules command lines) and ca0a4f689 (verifiers: File
|
|
|
|
|
type for fine-grained signature-verification controlling).
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
|
|
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
|
|
|
|
|
---
|
|
|
|
|
grub-core/loader/powerpc/ieee1275/linux.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
|
2022-03-29 18:03:52 +00:00
|
|
|
index c114e7df4..818b2a86d 100644
|
2021-03-30 15:50:09 +00:00
|
|
|
--- a/grub-core/loader/powerpc/ieee1275/linux.c
|
|
|
|
|
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
|
|
|
@@ -270,7 +270,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- elf = grub_elf_open (argv[0]);
|
|
|
|
|
+ elf = grub_elf_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
|
|
|
|
|
if (! elf)
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
@@ -303,7 +303,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
|
/* Create kernel command line. */
|
|
|
|
|
grub_memcpy (linux_args, LINUX_IMAGE, sizeof (LINUX_IMAGE));
|
|
|
|
|
if (grub_create_loader_cmdline (argc, argv, linux_args + sizeof (LINUX_IMAGE) - 1,
|
|
|
|
|
- size))
|
|
|
|
|
+ size, GRUB_VERIFY_KERNEL_CMDLINE))
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
out:
|
