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, 6 Dec 2018 13:38:15 +0100
5975ab
Subject: [PATCH] verifiers: Xen fallout cleanup
5975ab
5975ab
Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
5975ab
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/i386/xen.c | 14 +++++++-------
5975ab
 1 file changed, 7 insertions(+), 7 deletions(-)
5975ab
5975ab
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
5975ab
index 07a4837c532..071b530d744 100644
5975ab
--- a/grub-core/loader/i386/xen.c
5975ab
+++ b/grub-core/loader/i386/xen.c
5975ab
@@ -647,10 +647,10 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
5975ab
 
5975ab
   grub_xen_reset ();
5975ab
 
5975ab
-  grub_create_loader_cmdline (argc - 1, argv + 1,
5975ab
-			      (char *) xen_state.next_start.cmd_line,
5975ab
-			      sizeof (xen_state.next_start.cmd_line) - 1);
5975ab
-  err = grub_verify_string (xen_state.next_start.cmd_line, GRUB_VERIFY_MODULE_CMDLINE);
5975ab
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
5975ab
+				    (char *) xen_state.next_start.cmd_line,
5975ab
+				    sizeof (xen_state.next_start.cmd_line) - 1,
5975ab
+				    GRUB_VERIFY_KERNEL_CMDLINE);
5975ab
   if (err)
5975ab
     return err;
5975ab
 
5975ab
@@ -918,9 +918,9 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
5975ab
   if (err)
5975ab
     goto fail;
5975ab
 
5975ab
-  grub_create_loader_cmdline (argc - 1, argv + 1,
5975ab
-			      get_virtual_current_address (ch), cmdline_len);
5975ab
-  err = grub_verify_string (get_virtual_current_address (ch), GRUB_VERIFY_MODULE_CMDLINE);
5975ab
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
5975ab
+				    get_virtual_current_address (ch), cmdline_len,
5975ab
+				    GRUB_VERIFY_MODULE_CMDLINE);
5975ab
   if (err)
5975ab
     goto fail;
5975ab