|
 |
fd304b |
From e5c73239404931d4d1b73eb595c3802fbce74c61 Mon Sep 17 00:00:00 2001
|
|
|
fd304b |
From: Jean Delvare <jdelvare@suse.de>
|
|
|
fd304b |
Date: Mon, 2 Nov 2015 09:45:36 +0100
|
|
|
fd304b |
Subject: [PATCH 9/9] dmidecode: Check sysfs entry point length
|
|
|
fd304b |
|
|
|
fd304b |
Before passing the sysfs entry point data over for decoding, check
|
|
|
fd304b |
that its length meets the expectations.
|
|
|
fd304b |
---
|
|
|
fd304b |
CHANGELOG | 1 +
|
|
|
fd304b |
dmidecode.c | 6 +++---
|
|
|
fd304b |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
fd304b |
|
|
|
fd304b |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
fd304b |
index fcfc244..ba61cab 100644
|
|
|
fd304b |
--- a/CHANGELOG
|
|
|
fd304b |
+++ b/CHANGELOG
|
|
|
fd304b |
@@ -5,6 +5,7 @@
|
|
|
fd304b |
* dmidecode.c: Use read_file to read the DMI table from sysfs.
|
|
|
fd304b |
This fixes Savannah bug #46176:
|
|
|
fd304b |
https://savannah.nongnu.org/bugs/?46176
|
|
|
fd304b |
+ * dmidecode.c: Check the sysfs entry point length.
|
|
|
fd304b |
|
|
|
fd304b |
2015-10-21 Xie XiuQi <xiexiuqi@huawei.com>
|
|
|
fd304b |
|
|
|
fd304b |
diff --git a/dmidecode.c b/dmidecode.c
|
|
|
fd304b |
index 16d1823..b47c469 100644
|
|
|
fd304b |
--- a/dmidecode.c
|
|
|
fd304b |
+++ b/dmidecode.c
|
|
|
fd304b |
@@ -4840,17 +4840,17 @@ int main(int argc, char * const argv[])
|
|
|
fd304b |
{
|
|
|
fd304b |
if (!(opt.flags & FLAG_QUIET))
|
|
|
fd304b |
printf("Getting SMBIOS data from sysfs.\n");
|
|
|
fd304b |
- if (memcmp(buf, "_SM3_", 5) == 0)
|
|
|
fd304b |
+ if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0)
|
|
|
fd304b |
{
|
|
|
fd304b |
if (smbios3_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
|
|
|
fd304b |
found++;
|
|
|
fd304b |
}
|
|
|
fd304b |
- else if (memcmp(buf, "_SM_", 4) == 0)
|
|
|
fd304b |
+ else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0)
|
|
|
fd304b |
{
|
|
|
fd304b |
if (smbios_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
|
|
|
fd304b |
found++;
|
|
|
fd304b |
}
|
|
|
fd304b |
- else if (memcmp(buf, "_DMI_", 5) == 0)
|
|
|
fd304b |
+ else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0)
|
|
|
fd304b |
{
|
|
|
fd304b |
if (legacy_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
|
|
|
fd304b |
found++;
|
|
|
fd304b |
--
|
|
|
fd304b |
2.5.0
|
|
|
fd304b |
|