Re: grub2 efi patches

[Marco Gerards]

Alexandre Boeglin <address@hidden> writes:

> On Sun, 4 Nov 2007 00:06:31 +0100, Alexandre Boeglin <address@hidden>
> wrote:
>> grub2_efi_chainloader_options.patch adds support for efi chainload
>> options,
>> it is not really beautiful (for instance, the ascii to utf16 conversion),
>> but it works for the MacOSX loader,
>
> Sorry, there was a mistake in the previous one ...

Ok :-)

> By the way, it's using boot_services->allocate_pool instead of grub_malloc.
> I don't know if it's okay, but when I tried using grub_malloc, I was
> getting "free magic is broken 0x0" errors.

Please use grub_malloc.  If you get this error, something is most
likely writing to unallocated memory or something like that...

> Index: include/grub/efi/chainloader.h
> ===================================================================
> RCS file: /sources/grub/grub2/include/grub/efi/chainloader.h,v
> retrieving revision 1.2
> diff -u -r1.2 chainloader.h
> --- include/grub/efi/chainloader.h    21 Jul 2007 23:32:22 -0000      1.2
> +++ include/grub/efi/chainloader.h    4 Nov 2007 00:00:40 -0000
> @@ -19,6 +19,6 @@
>  #ifndef GRUB_EFI_CHAINLOADER_HEADER
>  #define GRUB_EFI_CHAINLOADER_HEADER  1
>  
> -void grub_chainloader_cmd (const char *filename);
> +void grub_chainloader_cmd (int argc, char *argv[]);
>  
>  #endif /* ! GRUB_EFI_CHAINLOADER_HEADER */
> Index: loader/efi/chainloader.c
> ===================================================================
> RCS file: /sources/grub/grub2/loader/efi/chainloader.c,v
> retrieving revision 1.2
> diff -u -r1.2 chainloader.c
> --- loader/efi/chainloader.c  21 Jul 2007 23:32:28 -0000      1.2
> +++ loader/efi/chainloader.c  4 Nov 2007 00:01:05 -0000
> @@ -17,8 +17,6 @@
>   *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -/* TODO: support load options.  */
> -
>  #include <grub/loader.h>
>  #include <grub/file.h>
>  #include <grub/err.h>
> @@ -175,7 +173,7 @@
>  }
>  
>  void
> -grub_chainloader_cmd (const char *filename)
> +grub_chainloader_cmd (int argc, char *argv[])
>  {
>    grub_file_t file = 0;
>    grub_ssize_t size;
> @@ -185,6 +183,11 @@
>    grub_device_t dev = 0;
>    grub_efi_device_path_t *dp = 0;
>    grub_efi_loaded_image_t *loaded_image;
> +  char *filename = argv[0];
> +  grub_efi_char16_t *options = NULL, *p;
> +  int i, j, options_len = 0;
> +
> +  b = grub_efi_system_table->boot_services;
>    
>    grub_dl_ref (my_mod);
>  
> @@ -192,6 +195,30 @@
>    address = 0;
>    image_handle = 0;
>    file_path = 0;
> +
> +  if (argc == 0)
> +  {
> +    grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
> +    goto fail;
> +  }
> +
> +  /* copy options */

/* Copy options.  */

> +  if (argc > 1)
> +  {
> +    for (i = 1; i < argc; i++)
> +      options_len += (grub_strlen (argv[i]) + 1) * sizeof (*options);
> +
> +    status = b->allocate_pool (GRUB_EFI_LOADER_DATA, options_len + sizeof 
> (*options), &options);
> +    if (status != GRUB_EFI_SUCCESS)
> +      goto fail;

Please use grub_malloc.

There are several ways to debug mm.c...

> +    p = options;
> +
> +    for (i = 1; i < argc; i++){
> +      *p++ = ' ';
> +      for (j = 0; j < grub_strlen (argv[i]) + 1; j++)
> +        p[j] = argv[i][j];
> +    }
> +  }
>    
>    b = grub_efi_system_table->boot_services;
>  
> @@ -267,6 +294,10 @@
>        goto fail;
>      }
>    loaded_image->device_handle = dev_handle;
> +
> +  if (options)
> +    loaded_image->load_options = options;
> +    loaded_image->load_options_size = options_len + 1;
>    
>    grub_file_close (file);
>    grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0);
> @@ -292,10 +323,7 @@
>  static void
>  grub_rescue_cmd_chainloader (int argc, char *argv[])
>  {
> -  if (argc == 0)
> -    grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
> -  else
> -    grub_chainloader_cmd (argv[0]);
> +  grub_chainloader_cmd (argc, argv);
>  }
>  
>  static const char loader_name[] = "chainloader";
> Index: loader/efi/chainloader_normal.c
> ===================================================================
> RCS file: /sources/grub/grub2/loader/efi/chainloader_normal.c,v
> retrieving revision 1.2
> diff -u -r1.2 chainloader_normal.c
> --- loader/efi/chainloader_normal.c   21 Jul 2007 23:32:28 -0000      1.2
> +++ loader/efi/chainloader_normal.c   4 Nov 2007 00:01:05 -0000
> @@ -26,10 +26,7 @@
>  chainloader_command (struct grub_arg_list *state __attribute__ ((unused)),
>                    int argc, char **args)
>  {
> -  if (argc == 0)
> -    grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
> -  else
> -    grub_chainloader_cmd (args[0]);
> +  grub_chainloader_cmd (argc, args);
>    return grub_errno;
>  }
>  
> _______________________________________________
> Grub-devel mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/grub-devel