firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices
PATCH 1/1 firmware: dmi: Fix unlikely out-of-bounds read in save_mem_devices
Before reading the Extended Size field, we should ensure it fits in the DMI record. There is already a record length check but it does not cover that field.
It would take a seriously corrupted DMI table to hit that bug, so no need to worry, but we should still fix it.
Signed-off-by Jean Delvare <[email protected]>
Fixes 6deae96b42eb ("firmware, DMI: Add function to look up a handle and return DIMM size")
Cc Tony Luck <[email protected]>
Cc Borislav Petkov <[email protected]>
--- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/dmi_scan.c +1 -1
@@ -408,7 +408,7 @@ static void __init save_mem_devices(cons bytes = ~0ull ; else if (size & 0x8000) bytes = (u64)(size &0x7fff ) <<10 ; - else if (size != 0x7fff) + else if (size != 0x7fff || dm->length < 0x20) bytes = (u64 )size <<20 ; else bytes = (u64 )get_unaligned ((u32 *)&d[0x1C ]) <<20 ;
Signature · 2 lines
Jean Delvare SUSE L3 Support