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