Commit fdb8a427 authored Aug 06, 2009 by Roel Kluin Committed by H. Peter Anvin Aug 09, 2009

x86: fix buffer overflow in efi_init()

If the vendor name (from c16) can be longer than 100 bytes (or missing a
terminating null), then the null is written past the end of vendor[].

Found with Parfait, http://research.sun.com/projects/parfait/



Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Huang Ying <ying.huang@intel.com>

parent 498cdbfb

arch/x86/kernel/efi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ void __init efi_init(void)
		*/
		c16 = tmp = early_ioremap(efi.systab->fw_vendor, 2);
		if (c16) {
		for (i = 0; i < sizeof(vendor) && *c16; ++i)
		for (i = 0; i < sizeof(vendor) - 1 && *c16; ++i)
		vendor[i] = *c16++;
		vendor[i] = '\0';
		} else

Admin message