Re: [GRUB PATCH 1/2] verifiers: Xen fallout cleanup

[Ross Philipson]

On 12/06/2018 08:40 AM, Daniel Kiper wrote:
> Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
> fine-grained signature-verification controlling).
> 
> Signed-off-by: Daniel Kiper <address@hidden>
> ---
>  grub-core/loader/i386/xen.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
> index 1a99ca72c..8f662c8ac 100644
> --- a/grub-core/loader/i386/xen.c
> +++ b/grub-core/loader/i386/xen.c
> @@ -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);

How did this compile previously if you were missing an argument to
grub_create_loader_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;
>  
>