Re: [PATCH 1/1] dmi_scan: uuid: fix endianess for smbios >= 0x206

[Matt Fleming]

(Cc'ing Jean since he's the maintainer)

On Tue, 22 Dec, at 02:53:10PM, Andrea Arcangeli wrote:
> 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: Federico Simoncelli <fsimonce@xxxxxxxxxx>
> Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
> ---
>  drivers/firmware/dmi_scan.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
> index ac1ce4a..0e08e66 100644
> --- a/drivers/firmware/dmi_scan.c
> +++ b/drivers/firmware/dmi_scan.c
> @@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/