diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch b/meta/recipes-bsp/grub/files/0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch new file mode 100644 index 0000000000..0e735ffcdc --- /dev/null +++ b/meta/recipes-bsp/grub/files/0002-grub-core-kern-efi-mm.c-grub_efi_get_memory_map-Neve.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 630de45f3d5f9a2dda7fad99acd21449b8c4111d Mon Sep 17 00:00:00 2001 | ||
2 | From: Awais Belal <awais_belal@mentor.com> | ||
3 | Date: Thu, 8 Dec 2016 18:27:01 +0500 | ||
4 | Subject: [PATCH 2/2] * grub-core/kern/efi/mm.c (grub_efi_get_memory_map): | ||
5 | Never return a descriptor_size==0 to avoid potential divisions by zero. | ||
6 | |||
7 | Upstream-status: Backport [ http://git.savannah.gnu.org/cgit/grub.git/commit/?id=69aee43fa64601cabf6efa9279c10d69b466662e ] | ||
8 | |||
9 | Signed-off-by: Awais Belal <awais_belal@mentor.com> | ||
10 | --- | ||
11 | grub-core/kern/efi/mm.c | 5 +++++ | ||
12 | 1 file changed, 5 insertions(+) | ||
13 | |||
14 | diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c | ||
15 | index b00e0bc..9f1d194 100644 | ||
16 | --- a/grub-core/kern/efi/mm.c | ||
17 | +++ b/grub-core/kern/efi/mm.c | ||
18 | @@ -235,6 +235,7 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, | ||
19 | grub_efi_boot_services_t *b; | ||
20 | grub_efi_uintn_t key; | ||
21 | grub_efi_uint32_t version; | ||
22 | + grub_efi_uintn_t size; | ||
23 | |||
24 | if (grub_efi_is_finished) | ||
25 | { | ||
26 | @@ -264,10 +265,14 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, | ||
27 | map_key = &key; | ||
28 | if (! descriptor_version) | ||
29 | descriptor_version = &version; | ||
30 | + if (! descriptor_size) | ||
31 | + descriptor_size = &size; | ||
32 | |||
33 | b = grub_efi_system_table->boot_services; | ||
34 | status = efi_call_5 (b->get_memory_map, memory_map_size, memory_map, map_key, | ||
35 | descriptor_size, descriptor_version); | ||
36 | + if (*descriptor_size == 0) | ||
37 | + *descriptor_size = sizeof (grub_efi_memory_descriptor_t); | ||
38 | if (status == GRUB_EFI_SUCCESS) | ||
39 | return 1; | ||
40 | else if (status == GRUB_EFI_BUFFER_TOO_SMALL) | ||
41 | -- | ||
42 | 1.9.1 | ||
43 | |||