vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/loader/ia64/efi/linux.c (find_mmap_size): Replace fatal with

Browse source 
error.
	(allocate_pages): Check return value.
	Replace fatal with error.
	(grub_linux_boot): Replace printf with dprintf.
	Check find_mmap_size return value.
	Replace fatal with error.
	Don't call grub_machine_fini.
	(grub_load_elf64): Replace printf with dprintf.
	(grub_cmd_linux): Likewise.
	(grub_cmd_initrd): Likewise.
	(grub_cmd_payload): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-03 13:53:12 +01:00
parent c779226e6c
commit 347998c27f
2 changed files with 55 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2012-02-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/ia64/efi/linux.c (find_mmap_size): Replace fatal with
error.
(allocate_pages): Check return value.
Replace fatal with error.
(grub_linux_boot): Replace printf with dprintf.
Check find_mmap_size return value.
Replace fatal with error.
Don't call grub_machine_fini.
(grub_load_elf64): Replace printf with dprintf.
(grub_cmd_linux): Likewise.
(grub_cmd_initrd): Likewise.
(grub_cmd_payload): Likewise.
2012-02-03 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/xnu.c (grub_cmd_devprop_load): Fix error * grub-core/loader/i386/xnu.c (grub_cmd_devprop_load): Fix error

65
grub-core/loader/ia64/efi/linux.c
View file

@ -175,7 +175,10 @@ find_mmap_size (void)
grub_free (mmap); grub_free (mmap);
if (ret < 0) if (ret < 0)
grub_fatal ("cannot get memory map"); {
grub_error (GRUB_ERR_IO, "cannot get memory map");
return 0;
}
else if (ret > 0) else if (ret > 0)
break; break;
@ -243,6 +246,8 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
size = size_pages << 12; size = size_pages << 12;
mmap_size = find_mmap_size (); mmap_size = find_mmap_size ();
if (!mmap_size)
return 0;
/* Read the memory map temporarily, to find free space. */ /* Read the memory map temporarily, to find free space. */
mmap = grub_malloc (mmap_size); mmap = grub_malloc (mmap_size);
@ -251,7 +256,10 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
tmp_mmap_size = mmap_size; tmp_mmap_size = mmap_size;
if (grub_efi_get_memory_map (&tmp_mmap_size, mmap, 0, &desc_size, 0) <= 0) if (grub_efi_get_memory_map (&tmp_mmap_size, mmap, 0, &desc_size, 0) <= 0)
grub_fatal ("cannot get memory map"); {
grub_error (GRUB_ERR_IO, "cannot get memory map");
goto fail;
}
mmap_end = NEXT_MEMORY_DESCRIPTOR (mmap, tmp_mmap_size); mmap_end = NEXT_MEMORY_DESCRIPTOR (mmap, tmp_mmap_size);
@ -279,7 +287,10 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
continue; continue;
mem = grub_efi_allocate_pages (aligned_start, size_pages); mem = grub_efi_allocate_pages (aligned_start, size_pages);
if (! mem) if (! mem)
grub_fatal ("cannot allocate pages"); {
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
goto fail;
}
break; break;
} }
@ -309,10 +320,10 @@ set_boot_param_console (void)
!= GRUB_EFI_SUCCESS) != GRUB_EFI_SUCCESS)
return; return;
grub_dprintf("linux", grub_dprintf ("linux",
"Console info: cols=%lu rows=%lu x=%u y=%u\n", "Console info: cols=%lu rows=%lu x=%u y=%u\n",
cols, rows, cols, rows,
conout->mode->cursor_column, conout->mode->cursor_row); conout->mode->cursor_column, conout->mode->cursor_row);
boot_param->console_info.num_cols = cols; boot_param->console_info.num_cols = cols;
boot_param->console_info.num_rows = rows; boot_param->console_info.num_rows = rows;
@ -340,17 +351,17 @@ grub_linux_boot (void)
set_boot_param_console (); set_boot_param_console ();
grub_printf ("Jump to %016lx\n", entry); grub_dprintf ("linux", "Jump to %016lx\n", entry);
grub_machine_fini ();
/* MDT. /* MDT.
Must be done after grub_machine_fini because map_key is used by Must be done after grub_machine_fini because map_key is used by
exit_boot_services. */ exit_boot_services. */
mmap_size = find_mmap_size (); mmap_size = find_mmap_size ();
if (! mmap_size)
return grub_errno;
mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12); mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12);
if (! mmap_buf) if (! mmap_buf)
grub_fatal ("cannot allocate memory map"); return grub_error (GRUB_ERR_IO, "cannot allocate memory map");
err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, &map_key, err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, &map_key,
&desc_size, &desc_version); &desc_size, &desc_version);
if (err) if (err)
@ -448,8 +459,8 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)
if (kernel_mem) if (kernel_mem)
{ {
reloc_offset = (grub_uint64_t)kernel_mem - low_addr; reloc_offset = (grub_uint64_t)kernel_mem - low_addr;
grub_printf (" Relocated at %p (offset=%016lx)\n", grub_dprintf ("linux", " Relocated at %p (offset=%016lx)\n",
kernel_mem, reloc_offset); kernel_mem, reloc_offset);
entry += reloc_offset; entry += reloc_offset;
} }
} }
@ -464,10 +475,10 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)
+ i * ehdr->e_phentsize); + i * ehdr->e_phentsize);
if (phdr->p_type == PT_LOAD) if (phdr->p_type == PT_LOAD)
{ {
grub_printf (" [paddr=%lx load=%lx memsz=%08lx " grub_dprintf ("linux", " [paddr=%lx load=%lx memsz=%08lx "
"off=%lx flags=%x]\n", "off=%lx flags=%x]\n",
phdr->p_paddr, phdr->p_paddr + reloc_offset, phdr->p_paddr, phdr->p_paddr + reloc_offset,
phdr->p_memsz, phdr->p_offset, phdr->p_flags); phdr->p_memsz, phdr->p_offset, phdr->p_flags);
if (grub_file_seek (file, phdr->p_offset) == (grub_off_t)-1) if (grub_file_seek (file, phdr->p_offset) == (grub_off_t)-1)
return grub_error (GRUB_ERR_BAD_OS, return grub_error (GRUB_ERR_BAD_OS,
@ -529,7 +540,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
grub_printf ("Loading linux: %s\n", argv[0]); grub_dprintf ("linux", "Loading linux: %s\n", argv[0]);
if (grub_load_elf64 (file, buffer, argv[0])) if (grub_load_elf64 (file, buffer, argv[0]))
goto fail; goto fail;
@ -605,7 +616,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
initrd_size = 0; initrd_size = 0;
grub_printf ("Loading initrd: "); grub_dprintf ("linux", "Loading initrd\n");
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
{ {
grub_file_filter_disable_compression (); grub_file_filter_disable_compression ();
@ -614,17 +625,19 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
nfiles++; nfiles++;
initrd_size += grub_file_size (files[i]); initrd_size += grub_file_size (files[i]);
grub_printf ("%c%s\n", i == 0 ? ' ' : '+', argv[i]); grub_dprintf ("linux", "File %d: %s\n", i, argv[i]);
} }
grub_printf ("\n");
initrd_pages = (page_align (initrd_size) >> 12); initrd_pages = (page_align (initrd_size) >> 12);
initrd_mem = grub_efi_allocate_pages (0, initrd_pages); initrd_mem = grub_efi_allocate_pages (0, initrd_pages);
if (! initrd_mem) if (! initrd_mem)
grub_fatal ("cannot allocate pages"); {
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate pages");
goto fail;
}
grub_printf (" [addr=0x%lx, size=0x%lx]\n", grub_dprintf ("linux", "[addr=0x%lx, size=0x%lx]\n",
(grub_uint64_t)initrd_mem, initrd_size); (grub_uint64_t) initrd_mem, initrd_size);
ptr = initrd_mem; ptr = initrd_mem;
for (i = 0; i < nfiles; i++) for (i = 0; i < nfiles; i++)
@ -678,8 +691,8 @@ grub_cmd_payload (grub_command_t cmd __attribute__ ((unused)),
if (! base) if (! base)
goto fail; goto fail;
grub_printf ("Payload %s [addr=%lx + %lx]\n", grub_dprintf ("linux", "Payload %s [addr=%lx + %lx]\n",
argv[0], (grub_uint64_t)base, size); argv[0], (grub_uint64_t)base, size);
if (grub_file_read (file, base, size) != size) if (grub_file_read (file, base, size) != size)
{ {