1
0
Fork 0

firmware: dmi_scan: Fix UUID length safety check

[ Upstream commit 90fe6f8ff0 ]

The test which ensures that the DMI type 1 structure is long enough
to hold the UUID is off by one. It would fail if the structure is
exactly 24 bytes long, while that's sufficient to hold the UUID.

I don't expect this bug to cause problem in practice because all
implementations I have seen had length 8, 25 or 27 bytes, in line
with the SMBIOS specifications. But let's fix it still.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: a814c3597a ("firmware: dmi_scan: Check DMI structure length")
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Jean Delvare 2018-04-13 15:37:59 +02:00 committed by Greg Kroah-Hartman
parent d9179b4aa4
commit 145b7e06de
1 changed files with 1 additions and 1 deletions

View File

@ -191,7 +191,7 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot,
char *s;
int is_ff = 1, is_00 = 1, i;
if (dmi_ident[slot] || dm->length <= index + 16)
if (dmi_ident[slot] || dm->length < index + 16)
return;
d = (u8 *) dm + index;