dcavalca / rpms / grub2

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