summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-08-06 15:58:13 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-08-09 01:08:42 -0700
commitfdb8a42742ac95606668f73481dfb2f760658fdd (patch)
tree5dd433f3190ba47117a7bc849b71eb38878e6c85 /arch
parent498cdbfbcf98e0d2c90a26e6a02a82f043876e48 (diff)
downloadlinux-fdb8a42742ac95606668f73481dfb2f760658fdd.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/efi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index 19ccf6d0dccf..fe26ba3e3451 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -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