summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2018-04-13 16:37:59 +0300
committerJean Delvare <jdelvare@suse.de>2018-04-13 16:37:59 +0300
commit90fe6f8ff00a07641ca893d64f75ca22ce77cca2 (patch)
treec472ca195b90ec429c8b70997eb6d6638f6cd3c2 /drivers
parent0adb32858b0bddf4ada5f364a84ed60b196dbcda (diff)
downloadlinux-90fe6f8ff00a07641ca893d64f75ca22ce77cca2.tar.xz
firmware: dmi_scan: Fix UUID length safety check
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: a814c3597a6b ("firmware: dmi_scan: Check DMI structure length") Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/dmi_scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index e763e1484331..c3be8ef9243f 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -186,7 +186,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;