Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4319dc authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Jean Delvare
Browse files

firmware: dmi_scan: Fix UUID endianness for SMBIOS >= 2.6 



The dmi_ver wasn't updated correctly before the dmi_decode method run
to save the uuid.

That resulted in "dmidecode -s system-uuid" and
/sys/class/dmi/id/product_uuid disagreeing. The latter was buggy and
this fixes it.

Reported-by: default avatarFederico Simoncelli <fsimonce@redhat.com>
Fixes: 9f9c9cbb ("drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists")
Fixes: 79bae42d ("dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present()")
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
parent 02006f7a

drivers/firmware/dmi_scan.c

+3 −3
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ static int __init dmi_present(const u8 *buf) 
			dmi_ver = smbios_ver;

		else

			dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F);

		dmi_ver <<= 8;

		dmi_num = get_unaligned_le16(buf + 12);

		dmi_len = get_unaligned_le16(buf + 6);

		dmi_base = get_unaligned_le32(buf + 8);
@@ -528,15 +529,14 @@ static int __init dmi_present(const u8 *buf) 
		if (dmi_walk_early(dmi_decode) == 0) {

			if (smbios_ver) {

				pr_info("SMBIOS %d.%d present.\n",

				       dmi_ver >> 8, dmi_ver & 0xFF);

					dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);

			} else {

				smbios_entry_point_size = 15;

				memcpy(smbios_entry_point, buf,

				       smbios_entry_point_size);

				pr_info("Legacy DMI %d.%d present.\n",

				       dmi_ver >> 8, dmi_ver & 0xFF);

					dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);

			}

			dmi_ver <<= 8;

			dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));

			printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);

			return 0;