]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
verifiers: Xen fallout cleanup
authorDaniel Kiper <daniel.kiper@oracle.com>
Thu, 6 Dec 2018 12:38:15 +0000 (13:38 +0100)
committerDaniel Kiper <daniel.kiper@oracle.com>
Fri, 7 Dec 2018 10:59:23 +0000 (11:59 +0100)
Xen fallout cleanup after commit 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/i386/xen.c

index 1a99ca72cd2d0399dd0f73e1d8b2ca0a8073e802..8f662c8ac891ac48b1e03b6d4b7ff112d6533a93 100644 (file)
@@ -645,10 +645,10 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
 
   grub_xen_reset ();
 
-  grub_create_loader_cmdline (argc - 1, argv + 1,
-                             (char *) xen_state.next_start.cmd_line,
-                             sizeof (xen_state.next_start.cmd_line) - 1);
-  err = grub_verify_string (xen_state.next_start.cmd_line, GRUB_VERIFY_MODULE_CMDLINE);
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
+                                   (char *) xen_state.next_start.cmd_line,
+                                   sizeof (xen_state.next_start.cmd_line) - 1,
+                                   GRUB_VERIFY_KERNEL_CMDLINE);
   if (err)
     return err;
 
@@ -910,9 +910,9 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
   if (err)
     goto fail;
 
-  grub_create_loader_cmdline (argc - 1, argv + 1,
-                             get_virtual_current_address (ch), cmdline_len);
-  err = grub_verify_string (get_virtual_current_address (ch), GRUB_VERIFY_MODULE_CMDLINE);
+  err = grub_create_loader_cmdline (argc - 1, argv + 1,
+                                   get_virtual_current_address (ch), cmdline_len,
+                                   GRUB_VERIFY_MODULE_CMDLINE);
   if (err)
     goto fail;