Changeset c9118b9eb373ccfacaee9866e3344fce14eee5af

Timestamp:

11/01/09 11:04:19 (2 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

57689f219c5155e186ced1c9f5f972d5d0b340ed

Parents:

2ce2b5480bd81d34e80be6dc246303eb710313f4

git-author:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-10-31T19:45:30Z-0700

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-11-01T12:04:19Z+0100

Message:

dmi: enhance SMBIOS/DMI detection

Add missing sanity checks when parsing the SMBIOS table entry point.

Signed-off-by: Pierre-Alexandre Meyer <pierre@…>

Files:

• com32/gpllib/dmi/dmi.c (modified) (5 diffs)

com32/gpllib/dmi/dmi.c

@@ -445 +445 @@
 }
 
-int dmi_checksum(uint8_t * buf, int len)
+int checksum(uint8_t * buf, int len)
 {
     uint8_t sum = 0;
@@ -482 +482 @@
         buf[11] << 24 | buf[10] << 16 | buf[9] << 8 | buf[8];
 
+    /* Version already found? */
     if (dmi->dmitable.ver>0) return DMI_TABLE_PRESENT;
 
@@ -491 +492 @@
      */
     if (buf[14] != 0) {
-        dmi->dmitable.major_version = buf[14] >> 4;
-        dmi->dmitable.minor_version = buf[14] & 0x0F;
+        dmi->dmitable.major_version = buf[14] >> 4;
+        dmi->dmitable.minor_version = buf[14] & 0x0F;
     } else {
-        dmi->dmitable.major_version = 0;
-        dmi->dmitable.minor_version = 0;
+        dmi->dmitable.major_version = 0;
+        dmi->dmitable.minor_version = 0;
     }
     return DMI_TABLE_PRESENT;
@@ -503 +504 @@
 int dmi_iterate(s_dmi * dmi)
 {
-    uint8_t buf[DMI_BUFFER_SIZE];
-    char *p, *q;
+    uint8_t *p, *q;
+    int found = 0;
 
     /* Cleaning structures */
@@ -526 +527 @@
     dmi->system.filled = false;
 
-    p = (char *)0xF0000;        /* The start address to look at the dmi table */
+    p = (uint8_t *)0xF0000;     /* The start address to look at the dmi table */
+    /* The anchor-string is 16-bytes aligned */
     for (q = p; q < p + 0x10000; q += 16) {
-        memcpy(buf, q, 15);
-        if (memcmp(buf, "_SM_", 4) == 0) {
-                smbios_decode(dmi,buf);
-        }
-        if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf,sizeof(buf))) {
-                return legacy_decode(dmi,buf);
-        }
-    }
+        /* To validate the presence of SMBIOS:
+         * + the overall checksum must be correct
+         * + the intermediate anchor-string must be _DMI_
+         * + the intermediate checksum must be correct
+         */
+        if (memcmp(q, "_SM_", 4) == 0 &&
+            checksum(q, q[0x05]) &&
+            memcmp(q + 0x10, "_DMI_", 5)==0 &&
+            checksum(q + 0x10, 0x0F)) {
+            /* Do not return, legacy_decode will need to be called
+             * on the intermediate structure to get the table length
+             * and address
+             */
+            smbios_decode(dmi, q);
+        } else if (memcmp(q, "_DMI_", 5) == 0 && checksum(q, 0x0F)) {
+            found = 1;
+            legacy_decode(dmi, q);
+        }
+    }
+
+    if (found)
+        return DMI_TABLE_PRESENT;
+
     dmi->dmitable.base = 0;
     dmi->dmitable.num = 0;