[PATCH] x86/dmi_scan: only honor end-of-table for 64-bit tables

[PATCH] x86/dmi_scan: only honor end-of-table for 64-bit tables

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 1868 bytes --]

From: Jean Delvare <jdelvare@suse.de>

A 32-bit entry point to a DMI table says how many structures the table
contains. The SMBIOS specification explicitly says that end-of-table
markers should be ignored if they are not actually at the end of the
DMI table. So only honor the end-of-table marker for tables accessed
through 64-bit entry points, as they do not specify a structure count.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
[Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9]
Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -148,10 +148,11 @@ static int __init dmi_table(paddr_t base
 	data = buf;
 
 	/*
- 	 *	Stop when we see all the items the table claimed to have
- 	 *	OR we run off the end of the table (also happens)
- 	 */
- 
+	 * Stop when we have seen all the items the table claimed to have
+	 * (SMBIOS < 3.0 only) OR we reach an end-of-table marker (SMBIOS
+	 * >= 3.0 only) OR we run off the end of the table (should never
+	 * happen but sometimes does on bogus implementations.)
+	 */
 	while((num < 0 || i < num) && data-buf+sizeof(struct dmi_header)<=len)
 	{
 		dm=(struct dmi_header *)data;
@@ -165,8 +166,16 @@ static int __init dmi_table(paddr_t base
 			data++;
 		if(data-buf<len-1)
 			decode(dm);
-		if (dm->type == DMI_ENTRY_END_OF_TABLE)
-		    break;
+		/*
+		 * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
+		 * For tables behind a 64-bit entry point, we have no item
+		 * count and no exact table length, so stop on end-of-table
+		 * marker. For tables behind a 32-bit entry point, we have
+		 * seen OEM structures behind the end-of-table marker on
+		 * some systems, so don't trust it.
+		 */
+		if (num < 0 && dm->type == DMI_ENTRY_END_OF_TABLE)
+			break;
 		data+=2;
 		i++;
 	}




[-- Attachment #2: x86-DMI-ignore-EOT-on-32bit-tables.patch --]
[-- Type: text/plain, Size: 1880 bytes --]

x86/dmi_scan: only honor end-of-table for 64-bit tables

A 32-bit entry point to a DMI table says how many structures the table
contains. The SMBIOS specification explicitly says that end-of-table
markers should be ignored if they are not actually at the end of the
DMI table. So only honor the end-of-table marker for tables accessed
through 64-bit entry points, as they do not specify a structure count.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
[Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9]
Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -148,10 +148,11 @@ static int __init dmi_table(paddr_t base
 	data = buf;
 
 	/*
- 	 *	Stop when we see all the items the table claimed to have
- 	 *	OR we run off the end of the table (also happens)
- 	 */
- 
+	 * Stop when we have seen all the items the table claimed to have
+	 * (SMBIOS < 3.0 only) OR we reach an end-of-table marker (SMBIOS
+	 * >= 3.0 only) OR we run off the end of the table (should never
+	 * happen but sometimes does on bogus implementations.)
+	 */
 	while((num < 0 || i < num) && data-buf+sizeof(struct dmi_header)<=len)
 	{
 		dm=(struct dmi_header *)data;
@@ -165,8 +166,16 @@ static int __init dmi_table(paddr_t base
 			data++;
 		if(data-buf<len-1)
 			decode(dm);
-		if (dm->type == DMI_ENTRY_END_OF_TABLE)
-		    break;
+		/*
+		 * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
+		 * For tables behind a 64-bit entry point, we have no item
+		 * count and no exact table length, so stop on end-of-table
+		 * marker. For tables behind a 32-bit entry point, we have
+		 * seen OEM structures behind the end-of-table marker on
+		 * some systems, so don't trust it.
+		 */
+		if (num < 0 && dm->type == DMI_ENTRY_END_OF_TABLE)
+			break;
 		data+=2;
 		i++;
 	}

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] x86/dmi_scan: only honor end-of-table for 64-bit tables

[Andrew Cooper]

On 13/08/15 11:58, Jan Beulich wrote:
> From: Jean Delvare <jdelvare@suse.de>
>
> A 32-bit entry point to a DMI table says how many structures the table
> contains. The SMBIOS specification explicitly says that end-of-table
> markers should be ignored if they are not actually at the end of the
> DMI table. So only honor the end-of-table marker for tables accessed
> through 64-bit entry points, as they do not specify a structure count.
>
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> [Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9]
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

/sigh firmware

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] x86/dmi_scan: only honor end-of-table for 64-bit tables

[Wei Liu]

On Thu, Aug 13, 2015 at 04:58:45AM -0600, Jan Beulich wrote:
> From: Jean Delvare <jdelvare@suse.de>
> 
> A 32-bit entry point to a DMI table says how many structures the table
> contains. The SMBIOS specification explicitly says that end-of-table
> markers should be ignored if they are not actually at the end of the
> DMI table. So only honor the end-of-table marker for tables accessed
> through 64-bit entry points, as they do not specify a structure count.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> [Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9]
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 

Release-acked-by: Wei Liu <wei.liu2@citrix.com>