3efed6
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
3efed6
From: Daniel Kiper <daniel.kiper@oracle.com>
3efed6
Date: Thu, 6 Dec 2018 13:38:15 +0100
3efed6
Subject: [PATCH] verifiers: Xen fallout cleanup
3efed6
3efed6
Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
3efed6
fine-grained signature-verification controlling).
3efed6
3efed6
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
3efed6
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
3efed6
---
3efed6
 grub-core/loader/i386/xen.c | 14 +++++++-------
3efed6
 1 file changed, 7 insertions(+), 7 deletions(-)
3efed6
3efed6
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
b71686
index 07a4837c5..071b530d7 100644
3efed6
--- a/grub-core/loader/i386/xen.c
3efed6
+++ b/grub-core/loader/i386/xen.c
3efed6
@@ -647,10 +647,10 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
3efed6
 
3efed6
   grub_xen_reset ();
3efed6
 
3efed6
-  grub_create_loader_cmdline (argc - 1, argv + 1,
3efed6
-			      (char *) xen_state.next_start.cmd_line,
3efed6
-			      sizeof (xen_state.next_start.cmd_line) - 1);
3efed6
-  err = grub_verify_string (xen_state.next_start.cmd_line, GRUB_VERIFY_MODULE_CMDLINE);
3efed6
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
3efed6
+				    (char *) xen_state.next_start.cmd_line,
3efed6
+				    sizeof (xen_state.next_start.cmd_line) - 1,
3efed6
+				    GRUB_VERIFY_KERNEL_CMDLINE);
3efed6
   if (err)
3efed6
     return err;
3efed6
 
3efed6
@@ -918,9 +918,9 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
3efed6
   if (err)
3efed6
     goto fail;
3efed6
 
3efed6
-  grub_create_loader_cmdline (argc - 1, argv + 1,
3efed6
-			      get_virtual_current_address (ch), cmdline_len);
3efed6
-  err = grub_verify_string (get_virtual_current_address (ch), GRUB_VERIFY_MODULE_CMDLINE);
3efed6
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
3efed6
+				    get_virtual_current_address (ch), cmdline_len,
3efed6
+				    GRUB_VERIFY_MODULE_CMDLINE);
3efed6
   if (err)
3efed6
     goto fail;
3efed6