Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1296797 > unrolled thread
| Started by | Andrea Arcangeli <aarcange@redhat.com> |
|---|---|
| First post | 2015-12-22 15:00 +0100 |
| Last post | 2015-12-22 16:20 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 0/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 Andrea Arcangeli <aarcange@redhat.com> - 2015-12-22 15:00 +0100
[PATCH 1/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 Andrea Arcangeli <aarcange@redhat.com> - 2015-12-22 15:00 +0100
Re: [PATCH 1/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 Matt Fleming <matt@codeblueprint.co.uk> - 2015-12-22 16:20 +0100
| From | Andrea Arcangeli <aarcange@redhat.com> |
|---|---|
| Date | 2015-12-22 15:00 +0100 |
| Subject | [PATCH 0/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 |
| Message-ID | <qIvDP-4ET-1@gated-at.bofh.it> |
Hello, this fixes https://bugzilla.kernel.org/show_bug.cgi?id=109731 Without this fix when this code runs: if (dmi_ver >= 0x020600) sprintf(s, "%pUL", d); else sprintf(s, "%pUB", d); dmi_ver is still set to the old 0x20X instead of 0x20X00 as intended after commit 95be58df74a5b21e5a78e45fddb2fd59112524c5. Andrea Arcangeli (1): dmi_scan: uuid: fix endianess for smbios >= 0x206 drivers/firmware/dmi_scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Andrea Arcangeli <aarcange@redhat.com> |
|---|---|
| Date | 2015-12-22 15:00 +0100 |
| Subject | [PATCH 1/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 |
| Message-ID | <qIvDQ-4ET-3@gated-at.bofh.it> |
| In reply to | #1296797 |
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@redhat.com>
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
---
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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2015-12-22 16:20 +0100 |
| Subject | Re: [PATCH 1/1] dmi_scan: uuid: fix endianess for smbios >= 0x206 |
| Message-ID | <qIwTg-5Bi-3@gated-at.bofh.it> |
| In reply to | #1296798 |
(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@redhat.com>
> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
> ---
> 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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web