From 69aee43fa64601cabf6efa9279c10d69b466662e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 21 Jan 2015 10:17:36 +0100 Subject: [PATCH] * grub-core/kern/efi/mm.c (grub_efi_get_memory_map): Never return a descriptor_size==0 to avoid potential divisions by zero. --- ChangeLog | 5 +++++ grub-core/kern/efi/mm.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 167056907..f9ac59915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-20 Vladimir Serbinenko + + * grub-core/kern/efi/mm.c (grub_efi_get_memory_map): Never return a + descriptor_size==0 to avoid potential divisions by zero. + 2015-01-20 Vladimir Serbinenko * grub-core/osdep/haiku/getroot.c (grub_util_find_partition_start_os): diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c index be37afd9d..20a47aaf5 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -230,6 +230,7 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, grub_efi_boot_services_t *b; grub_efi_uintn_t key; grub_efi_uint32_t version; + grub_efi_uintn_t size; if (grub_efi_is_finished) { @@ -259,10 +260,14 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, map_key = &key; if (! descriptor_version) descriptor_version = &version; + if (! descriptor_size) + descriptor_size = &size; b = grub_efi_system_table->boot_services; status = efi_call_5 (b->get_memory_map, memory_map_size, memory_map, map_key, descriptor_size, descriptor_version); + if (*descriptor_size == 0) + *descriptor_size = sizeof (grub_efi_memory_descriptor_t); if (status == GRUB_EFI_SUCCESS) return 1; else if (status == GRUB_EFI_BUFFER_TOO_SMALL)