firmware: dmi_scan: Only honor end-of-table for 64-bit tables
PATCH 1/1 firmware: dmi_scan: Only honor end-of-table for 64-bit tables
From: Jean Delvare <[email protected]>
Subject: firmware: 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.
--- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/dmi_scan.c +1 -1
@@ -111,7 +111,7 @@ static void dmi_table(u8 *buf,/* * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0] */ -if (dm->type ==DMI_ENTRY_END_OF_TABLE ) +if (!dmi_num && dm->type ==DMI_ENTRY_END_OF_TABLE )break ; data +=2 ;
Signature · 2 lines
Jean Delvare SUSE L3 Support
Quoted 21 lines · Jean Delvare
From: Jean Delvare <[email protected]>
Subject: firmware:dmi_scan: Only honor end-of-table for 64-bit tablesA 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.
Fixes fc43026278 ("dmi: add support for SMBIOS 3.0 64-bit entry point")Signed-off-by Jean Delvare <[email protected]>Cc Leif Lindholm <[email protected]>Cc Matt Fleming <[email protected]>Cc Ard Biesheuvel <[email protected]>--- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 static void dmi_table(u8 *buf, · line 112
Quoted 2 lines
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 renamed from drivers/firmware/dmi_scan.c 2015-04-28 16:39:00.845282262 +0200 +0
-0@@ -111,7 +111,7 @@ static void dmi_table(u8 *buf, /* * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
I wrote this comment under the assumption that type #127 was new in v3, but apparently it is not.
Since you are changing the test below into something non-trivial, could we perhaps update the comment to explain better what goes on here?
Quoted 7 lines
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 renamed from drivers/firmware/dmi_scan.c 2015-04-28 16:39:00.845282262 +0200 +1
-1*/ - if (dm->type == DMI_ENTRY_END_OF_TABLE) + if (!dmi_num && dm->type == DMI_ENTRY_END_OF_TABLE) break; data += 2;
Hi Ard,
Quoted 19 lines · Ard Biesheuvel
Quoted 18 lines · Jean Delvare
From: Jean Delvare <[email protected]>
Subject: firmware:dmi_scan: Only honor end-of-table for 64-bit tablesA 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.
Fixes fc43026278 ("dmi: add support for SMBIOS 3.0 64-bit entry point")Signed-off-by Jean Delvare <[email protected]>Cc Leif Lindholm <[email protected]>Cc Matt Fleming <[email protected]>Cc Ard Biesheuvel <[email protected]>--- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 static void dmi_table(u8 *buf, · line 112
Quoted 5 lines
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 renamed from drivers/firmware/dmi_scan.c 2015-04-28 16:39:00.845282262 +0200 +0
-0@@ -111,7 +111,7 @@ static void dmi_table(u8 *buf, /* * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]I wrote this comment under the assumption that type #127 was new in v3, but apparently it is not.
Since you are changing the test below into something non-trivial, could we perhaps update the comment to explain better what goes on here?
Good idea, thanks for suggesting. Version 2 of the patch is coming.
Quoted 7 lines
Quoted 7 lines
drivers/firmware/dmi_scan.c 2015-04-28 16:47:35.092644748 +0200 renamed from drivers/firmware/dmi_scan.c 2015-04-28 16:39:00.845282262 +0200 +1
-1*/ - if (dm->type == DMI_ENTRY_END_OF_TABLE) + if (!dmi_num && dm->type == DMI_ENTRY_END_OF_TABLE) break; data += 2;
Signature · 2 lines
Jean Delvare SUSE L3 Support