lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 3 Jan 2014 16:08:47 -0800 From: Joe Perches <joe@...ches.com> To: Matt Fleming <matt.fleming@...el.com> Cc: Matthew Garrett <matthew.garrett@...ula.com>, Matt Fleming <matt.fleming@...el.com>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, x86@...nel.org, linux-efi@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH 1/2] efi: Fix krealloc defect krealloc should use a temporary pointer for allocations and check the temporary pointer returned against NULL too. Signed-off-by: Joe Perches <joe@...ches.com> cc: Matthew Garrett <matthew.garrett@...ula.com> --- arch/x86/platform/efi/efi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index cceb813..ef7b7b4 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -798,6 +798,8 @@ void __init efi_enter_virtual_mode(void) } for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { + void *new_memmap2; + md = p; if (!(md->attribute & EFI_MEMORY_RUNTIME)) { #ifdef CONFIG_X86_64 @@ -834,9 +836,13 @@ void __init efi_enter_virtual_mode(void) systab += md->virt_addr - md->phys_addr; efi.systab = (efi_system_table_t *) (unsigned long) systab; } - new_memmap = krealloc(new_memmap, - (count + 1) * memmap.desc_size, - GFP_KERNEL); + new_memmap2 = krealloc(new_memmap, + (count + 1) * memmap.desc_size, + GFP_KERNEL); + if (!new_memmap2) + continue; + + new_memmap = new_memmap2; memcpy(new_memmap + (count * memmap.desc_size), md, memmap.desc_size); count++; -- 1.8.1.2.459.gbcd45b4.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists