Commit ce204e9a authored Feb 18, 2015 by Ivan Khoronzhuk Committed by Matt Fleming Feb 18, 2015

firmware: dmi_scan: Fix dmi scan to handle "End of Table" structure



The dmi-sysfs should create "End of Table" entry, that is type 127. But
after adding initial SMBIOS v3 support fc430262 ("dmi: add support
for SMBIOS 3.0 64-bit entry point") the 127-0 entry is not handled any
more, as result it's not created in dmi sysfs for instance. This is
important because the size of whole DMI table must correspond to sum of
all DMI entry sizes.

So move the end-of-table check after it's handled by dmi_table.

Reviewed-by: Ard Biesheuvel <ard@linaro.org>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: <stable@vger.kernel.org> # v3.19
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent 43a9f696

drivers/firmware/dmi_scan.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -92,12 +92,6 @@ static void dmi_table(u8 *buf, int len, int num,
		while ((i < num) && (data - buf + sizeof(struct dmi_header)) <= len) {
		const struct dmi_header dm = (const struct dmi_header )data;

		/*
		* 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
		*/
		if (dm->type == DMI_ENTRY_END_OF_TABLE)
		break;

		/*
		* We want to know the total length (formatted area and
		* strings) before decoding to make sure we won't run off the
		@@ -108,6 +102,13 @@ static void dmi_table(u8 *buf, int len, int num,
		data++;
		if (data - buf < len - 1)
		decode(dm, private_data);

		/*
		* 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
		*/
		if (dm->type == DMI_ENTRY_END_OF_TABLE)
		break;

		data += 2;
		i++;
		}