Import from CS git
This commit is contained in:
parent
ca25ecd9e5
commit
1c065e86ad
@ -1 +1 @@
|
|||||||
99b8a9deaf0a003083a5a5fadcb8c016e4ebdaa4 SOURCES/dmidecode-3.3.tar.xz
|
80898f5e95d905080426fdff7899d81eb4f888c2 SOURCES/dmidecode-3.5.tar.xz
|
||||||
|
|||||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/dmidecode-3.3.tar.xz
|
SOURCES/dmidecode-3.5.tar.xz
|
||||||
|
|||||||
@ -1,75 +0,0 @@
|
|||||||
From 0d40ff02f2ae692c34cfd63b0617abf66ea58c5e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Wed, 21 Oct 2020 15:24:40 +0200
|
|
||||||
Subject: [PATCH 1/2] dmidecode: Add new system slot types from SMBIOS spec
|
|
||||||
3.4.0
|
|
||||||
|
|
||||||
Based on an earlier patch from Prabhakar Pujeri (Dell).
|
|
||||||
|
|
||||||
Version 3.4.0 of the SMBIOS specification adds 14 new system slot
|
|
||||||
types and updates 2 (DMI type 9).
|
|
||||||
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 26 ++++++++++++++++++++------
|
|
||||||
1 file changed, 20 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 981fe9697458..0e480d3e337b 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -1931,11 +1931,16 @@ static const char *dmi_slot_type(u8 code)
|
|
||||||
"MXM Type IV",
|
|
||||||
"MXM 3.0 Type A",
|
|
||||||
"MXM 3.0 Type B",
|
|
||||||
- "PCI Express 2 SFF-8639",
|
|
||||||
- "PCI Express 3 SFF-8639",
|
|
||||||
+ "PCI Express 2 SFF-8639 (U.2)",
|
|
||||||
+ "PCI Express 3 SFF-8639 (U.2)",
|
|
||||||
"PCI Express Mini 52-pin with bottom-side keep-outs",
|
|
||||||
"PCI Express Mini 52-pin without bottom-side keep-outs",
|
|
||||||
- "PCI Express Mini 76-pin" /* 0x23 */
|
|
||||||
+ "PCI Express Mini 76-pin"
|
|
||||||
+ "PCI Express 4 SFF-8639 (U.2)",
|
|
||||||
+ "PCI Express 5 SFF-8639 (U.2)",
|
|
||||||
+ "OCP NIC 3.0 Small Form Factor (SFF)",
|
|
||||||
+ "OCP NIC 3.0 Large Form Factor (LFF)",
|
|
||||||
+ "OCP NIC Prior to 3.0" /* 0x28 */
|
|
||||||
};
|
|
||||||
static const char *type_0x30[] = {
|
|
||||||
"CXL FLexbus 1.0" /* 0x30 */
|
|
||||||
@@ -1970,18 +1975,27 @@ static const char *dmi_slot_type(u8 code)
|
|
||||||
"PCI Express 4 x2",
|
|
||||||
"PCI Express 4 x4",
|
|
||||||
"PCI Express 4 x8",
|
|
||||||
- "PCI Express 4 x16" /* 0xBD */
|
|
||||||
+ "PCI Express 4 x16",
|
|
||||||
+ "PCI Express 5",
|
|
||||||
+ "PCI Express 5 x1",
|
|
||||||
+ "PCI Express 5 x2",
|
|
||||||
+ "PCI Express 5 x4",
|
|
||||||
+ "PCI Express 5 x8",
|
|
||||||
+ "PCI Express 5 x16",
|
|
||||||
+ "PCI Express 6+",
|
|
||||||
+ "EDSFF E1",
|
|
||||||
+ "EDSFF E3" /* 0xC6 */
|
|
||||||
};
|
|
||||||
/*
|
|
||||||
* Note to developers: when adding entries to these lists, check if
|
|
||||||
* function dmi_slot_id below needs updating too.
|
|
||||||
*/
|
|
||||||
|
|
||||||
- if (code >= 0x01 && code <= 0x23)
|
|
||||||
+ if (code >= 0x01 && code <= 0x28)
|
|
||||||
return type[code - 0x01];
|
|
||||||
if (code == 0x30)
|
|
||||||
return type_0x30[code - 0x30];
|
|
||||||
- if (code >= 0xA0 && code <= 0xBD)
|
|
||||||
+ if (code >= 0xA0 && code <= 0xC6)
|
|
||||||
return type_0xA0[code - 0xA0];
|
|
||||||
return out_of_spec;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
From ac65cf23af7cccecb4175d3c13460928e8e2f51d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Fri, 26 May 2023 17:41:51 +0200
|
||||||
|
Subject: [PATCH] dmidecode: Add processor support from SMBIOS 3.6.0
|
||||||
|
|
||||||
|
SMBIOS 3.6.0 adds the following to the Processor Information
|
||||||
|
structure (type 4):
|
||||||
|
* 9 socket types
|
||||||
|
* 1 processor family
|
||||||
|
* 1 field (Thread Enabled)
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
---
|
||||||
|
dmidecode.c | 19 ++++++++++++++++---
|
||||||
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmidecode.c b/dmidecode.c
|
||||||
|
index 75b58b1..0e8a98c 100644
|
||||||
|
--- a/dmidecode.c
|
||||||
|
+++ b/dmidecode.c
|
||||||
|
@@ -974,6 +974,7 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver)
|
||||||
|
|
||||||
|
{ 0x100, "ARMv7" },
|
||||||
|
{ 0x101, "ARMv8" },
|
||||||
|
+ { 0x102, "ARMv9" },
|
||||||
|
{ 0x104, "SH-3" },
|
||||||
|
{ 0x105, "SH-4" },
|
||||||
|
{ 0x118, "ARM" },
|
||||||
|
@@ -1073,7 +1074,7 @@ static enum cpuid_type dmi_get_cpuid_type(const struct dmi_header *h)
|
||||||
|
else
|
||||||
|
return cpuid_80486;
|
||||||
|
}
|
||||||
|
- else if ((type >= 0x100 && type <= 0x101) /* ARM */
|
||||||
|
+ else if ((type >= 0x100 && type <= 0x102) /* ARM */
|
||||||
|
|| (type >= 0x118 && type <= 0x119)) /* ARM */
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
@@ -1415,10 +1416,19 @@ static const char *dmi_processor_upgrade(u8 code)
|
||||||
|
"Socket BGA1528",
|
||||||
|
"Socket LGA4189",
|
||||||
|
"Socket LGA1200",
|
||||||
|
- "Socket LGA4677" /* 0x3F */
|
||||||
|
+ "Socket LGA4677",
|
||||||
|
+ "Socket LGA1700",
|
||||||
|
+ "Socket BGA1744",
|
||||||
|
+ "Socket BGA1781",
|
||||||
|
+ "Socket BGA1211",
|
||||||
|
+ "Socket BGA2422",
|
||||||
|
+ "Socket LGA1211",
|
||||||
|
+ "Socket LGA2422",
|
||||||
|
+ "Socket LGA5773",
|
||||||
|
+ "Socket BGA5773" /* 0x48 */
|
||||||
|
};
|
||||||
|
|
||||||
|
- if (code >= 0x01 && code <= 0x3F)
|
||||||
|
+ if (code >= 0x01 && code <= 0x48)
|
||||||
|
return upgrade[code - 0x01];
|
||||||
|
return out_of_spec;
|
||||||
|
}
|
||||||
|
@@ -4451,6 +4461,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
|
||||||
|
pr_attr("Thread Count", "%u",
|
||||||
|
h->length >= 0x30 && data[0x25] == 0xFF ?
|
||||||
|
WORD(data + 0x2E) : data[0x25]);
|
||||||
|
+ if (h->length >= 0x32 && WORD(data + 0x30) != 0)
|
||||||
|
+ pr_attr("Thread Enabled", "%u",
|
||||||
|
+ WORD(data + 0x30));
|
||||||
|
dmi_processor_characteristics("Characteristics",
|
||||||
|
WORD(data + 0x26));
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
From c76ddda0ba0aa99a55945e3290095c2ec493c892 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Wed, 26 Apr 2023 15:44:27 +0200
|
||||||
|
Subject: [PATCH] Consistently use read_file() when reading from a dump file
|
||||||
|
|
||||||
|
Use read_file() instead of mem_chunk() to read the entry point from a
|
||||||
|
dump file. This is faster, and consistent with how we then read the
|
||||||
|
actual DMI table from that dump file.
|
||||||
|
|
||||||
|
This made no functional difference so far, which is why it went
|
||||||
|
unnoticed for years. But now that a file type check was added to the
|
||||||
|
mem_chunk() function, we must stop using it to read from regular
|
||||||
|
files.
|
||||||
|
|
||||||
|
This will again allow root to use the --from-dump option.
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Tested-by: Jerry Hoemann <jerry.hoemann@hpe.com>
|
||||||
|
---
|
||||||
|
dmidecode.c | 11 +++++++++--
|
||||||
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmidecode.c b/dmidecode.c
|
||||||
|
index 54f59c1..52ddbf1 100644
|
||||||
|
--- a/dmidecode.c
|
||||||
|
+++ b/dmidecode.c
|
||||||
|
@@ -6025,17 +6025,25 @@ int main(int argc, char * const argv[])
|
||||||
|
pr_comment("dmidecode %s", VERSION);
|
||||||
|
|
||||||
|
/* Read from dump if so instructed */
|
||||||
|
+ size = 0x20;
|
||||||
|
if (opt.flags & FLAG_FROM_DUMP)
|
||||||
|
{
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
pr_info("Reading SMBIOS/DMI data from file %s.",
|
||||||
|
opt.dumpfile);
|
||||||
|
- if ((buf = mem_chunk(0, 0x20, opt.dumpfile)) == NULL)
|
||||||
|
+ if ((buf = read_file(0, &size, opt.dumpfile)) == NULL)
|
||||||
|
{
|
||||||
|
ret = 1;
|
||||||
|
goto exit_free;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Truncated entry point can't be processed */
|
||||||
|
+ if (size < 0x20)
|
||||||
|
+ {
|
||||||
|
+ ret = 1;
|
||||||
|
+ goto done;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (memcmp(buf, "_SM3_", 5) == 0)
|
||||||
|
{
|
||||||
|
if (smbios3_decode(buf, opt.dumpfile, 0))
|
||||||
|
@@ -6059,7 +6067,6 @@ int main(int argc, char * const argv[])
|
||||||
|
* contain one of several types of entry points, so read enough for
|
||||||
|
* the largest one, then determine what type it contains.
|
||||||
|
*/
|
||||||
|
- size = 0x20;
|
||||||
|
if (!(opt.flags & FLAG_NO_SYSFS)
|
||||||
|
&& (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
From b289de9deb325eeef7919a1f4e3ac1f93b099c16 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Prabhakar pujeri <prabhakar.pujeri@gmail.com>
|
|
||||||
Date: Fri, 23 Oct 2020 17:45:16 +0200
|
|
||||||
Subject: [PATCH] Add new processor characteristics bits from SMBIOS spec 3.4.0
|
|
||||||
|
|
||||||
* The bit to indicate 128-bit capable processor
|
|
||||||
* The bit to indicate processor supports returning ARM64 SoC ID
|
|
||||||
|
|
||||||
Signed-off-by: Coiby Xu <coxu@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 31a49e4..67f6048 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -1388,7 +1388,9 @@ static void dmi_processor_characteristics(const char *attr, u16 code)
|
|
||||||
"Hardware Thread",
|
|
||||||
"Execute Protection",
|
|
||||||
"Enhanced Virtualization",
|
|
||||||
- "Power/Performance Control" /* 7 */
|
|
||||||
+ "Power/Performance Control",
|
|
||||||
+ "128-bit Capable"
|
|
||||||
+ "Arm64 SoC ID" /* 9 */
|
|
||||||
};
|
|
||||||
|
|
||||||
if ((code & 0x00FC) == 0)
|
|
||||||
@@ -1398,7 +1400,7 @@ static void dmi_processor_characteristics(const char *attr, u16 code)
|
|
||||||
int i;
|
|
||||||
|
|
||||||
pr_list_start(attr, NULL);
|
|
||||||
- for (i = 2; i <= 7; i++)
|
|
||||||
+ for (i = 2; i <= 9; i++)
|
|
||||||
if (code & (1 << i))
|
|
||||||
pr_list_item("%s", characteristics[i - 2]);
|
|
||||||
pr_list_end();
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
From ac6a64496fc99a5cc05ebe4dd7d1b88f60041009 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lianbo Jiang <lijiang@redhat.com>
|
|
||||||
Date: Thu, 10 Dec 2020 11:21:21 +0100
|
|
||||||
Subject: [PATCH] Missing comma in the dmi_slot_type()
|
|
||||||
|
|
||||||
In the initialization of "type", a suspicious concatenated string
|
|
||||||
"PCI Express Mini 76-pinPCI Express 4 SFF-8639 (U.2)" is produced
|
|
||||||
due to a missing comma between lines.
|
|
||||||
|
|
||||||
[JD: Fixed a similar bug in dmi_processor_characteristics.]
|
|
||||||
|
|
||||||
Fixes: b289de9deb32 ("Add new processor characteristics bits from SMBIOS spec 3.4.0")
|
|
||||||
Fixes: c54348130a2a ("dmidecode: Add new system slot types from SMBIOS spec 3.4.0")
|
|
||||||
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Signed-off-by: Coiby Xu <coxu@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index ac96395..4c98553 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -1389,7 +1389,7 @@ static void dmi_processor_characteristics(const char *attr, u16 code)
|
|
||||||
"Execute Protection",
|
|
||||||
"Enhanced Virtualization",
|
|
||||||
"Power/Performance Control",
|
|
||||||
- "128-bit Capable"
|
|
||||||
+ "128-bit Capable",
|
|
||||||
"Arm64 SoC ID" /* 9 */
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -1939,7 +1939,7 @@ static const char *dmi_slot_type(u8 code)
|
|
||||||
"PCI Express 3 SFF-8639 (U.2)",
|
|
||||||
"PCI Express Mini 52-pin with bottom-side keep-outs",
|
|
||||||
"PCI Express Mini 52-pin without bottom-side keep-outs",
|
|
||||||
- "PCI Express Mini 76-pin"
|
|
||||||
+ "PCI Express Mini 76-pin",
|
|
||||||
"PCI Express 4 SFF-8639 (U.2)",
|
|
||||||
"PCI Express 5 SFF-8639 (U.2)",
|
|
||||||
"OCP NIC 3.0 Small Form Factor (SFF)",
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 02ff0488f7d7a0f7e69ff7141236cbc1392c3b4c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Fri, 30 Oct 2020 15:36:19 +0100
|
|
||||||
Subject: [PATCH 2/2] dmidecode: Skip details of uninstalled memory modules
|
|
||||||
|
|
||||||
If a memory slot is empty then by definition the fields containing
|
|
||||||
the memory module details are irrelevant. Best case they are filled
|
|
||||||
with "Unused" and "None", but in some cases they are even invalid
|
|
||||||
because the manufacturer did not bother setting the fields to
|
|
||||||
valid neutral values. So it is better to not print these fields
|
|
||||||
at all, so as to not confuse the user.
|
|
||||||
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 0e480d3e337b..657a1341470b 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -4465,6 +4465,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
|
|
||||||
dmi_memory_device_type(data[0x12]));
|
|
||||||
dmi_memory_device_type_detail(WORD(data + 0x13));
|
|
||||||
if (h->length < 0x17) break;
|
|
||||||
+ /* If no module is present, the remaining fields are irrelevant */
|
|
||||||
+ if (WORD(data + 0x0C) == 0)
|
|
||||||
+ break;
|
|
||||||
dmi_memory_device_speed("Speed", WORD(data + 0x15));
|
|
||||||
if (h->length < 0x1B) break;
|
|
||||||
pr_attr("Manufacturer", "%s",
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From b3b4c29f38b29a6ac3779ff97363d42fd3061c4a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Prabhakar pujeri <prabhakar.pujeri@gmail.com>
|
|
||||||
Date: Mon, 19 Oct 2020 14:38:04 +0200
|
|
||||||
Subject: [PATCH] Add new processor upgrades from SMBIOS spec 3.4.0
|
|
||||||
|
|
||||||
Added 2 more new values (0x3D and 0x3E).
|
|
||||||
|
|
||||||
Signed-off-by: Coiby Xu <coxu@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 97ba941..eb5a5af 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -1355,10 +1355,12 @@ static const char *dmi_processor_upgrade(u8 code)
|
|
||||||
"Socket LGA2066",
|
|
||||||
"Socket BGA1392",
|
|
||||||
"Socket BGA1510",
|
|
||||||
- "Socket BGA1528" /* 0x3C */
|
|
||||||
+ "Socket BGA1528",
|
|
||||||
+ "Socket LGA4189",
|
|
||||||
+ "Socket LGA1200" /* 0x3E */
|
|
||||||
};
|
|
||||||
|
|
||||||
- if (code >= 0x01 && code <= 0x3C)
|
|
||||||
+ if (code >= 0x01 && code <= 0x3E)
|
|
||||||
return upgrade[code - 0x01];
|
|
||||||
return out_of_spec;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 7e25483a392e292c58cea67ba4d052856c2f35d0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Prabhakar pujeri <prabhakar.pujeri@gmail.com>
|
|
||||||
Date: Mon, 19 Oct 2020 14:38:04 +0200
|
|
||||||
Subject: [PATCH] Add new memory device types from SMBIOS spec 3.4.0
|
|
||||||
|
|
||||||
Added 2 more new values (0x22 and 0x23).
|
|
||||||
|
|
||||||
Signed-off-by: Coiby Xu <coxu@redhat.com>
|
|
||||||
---
|
|
||||||
dmidecode.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 8b6f5af..97ba941 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -2639,10 +2639,12 @@ static const char *dmi_memory_device_type(u8 code)
|
|
||||||
"LPDDR4",
|
|
||||||
"Logical non-volatile device",
|
|
||||||
"HBM",
|
|
||||||
- "HBM2" /* 0x21 */
|
|
||||||
+ "HBM2",
|
|
||||||
+ "DDR5",
|
|
||||||
+ "LPDDR5" /* 0x23 */
|
|
||||||
};
|
|
||||||
|
|
||||||
- if (code >= 0x01 && code <= 0x21)
|
|
||||||
+ if (code >= 0x01 && code <= 0x23)
|
|
||||||
return type[code - 0x01];
|
|
||||||
return out_of_spec;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Delvare <jdelvare@suse.de>
|
|
||||||
Date: Tue, 19 Jan 2021 16:26:01 +0100
|
|
||||||
Subject: [PATCH] dmidecode: Fix crash with -u option
|
|
||||||
|
|
||||||
A segmentation fault was reported with option -u. Turns out to be a
|
|
||||||
stupid thinko where the buffer offset was reset at the wrong loop
|
|
||||||
depth.
|
|
||||||
|
|
||||||
Reported-by: Jerry Hoemann <jerry.hoemann@hpe.com>
|
|
||||||
Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too")
|
|
||||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
||||||
---
|
|
||||||
dmidecode.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dmidecode.c b/dmidecode.c
|
|
||||||
index 572cb1a..69ea0e8 100644
|
|
||||||
--- a/dmidecode.c
|
|
||||||
+++ b/dmidecode.c
|
|
||||||
@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_header *h)
|
|
||||||
{
|
|
||||||
int j, l = strlen(s) + 1;
|
|
||||||
|
|
||||||
- off = 0;
|
|
||||||
for (row = 0; row < ((l - 1) >> 4) + 1; row++)
|
|
||||||
{
|
|
||||||
+ off = 0;
|
|
||||||
for (j = 0; j < 16 && j < l - (row << 4); j++)
|
|
||||||
off += sprintf(raw_data + off,
|
|
||||||
j ? " %02X" : "%02X",
|
|
||||||
--
|
|
||||||
2.31.0
|
|
||||||
|
|
||||||
@ -1,24 +1,17 @@
|
|||||||
Summary: Tool to analyse BIOS DMI data
|
Summary: Tool to analyse BIOS DMI data
|
||||||
Name: dmidecode
|
Name: dmidecode
|
||||||
Version: 3.3
|
Version: 3.5
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
|
Source0: https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
|
||||||
URL: http://www.nongnu.org/dmidecode/
|
URL: https://www.nongnu.org/dmidecode/
|
||||||
|
|
||||||
Patch0: 0001-dmidecode-Add-new-system-slot-types-from-SMBIOS-spec.patch
|
|
||||||
Patch1: 0002-dmidecode-Add-new-processor-characteristics-bits-from-SMBIOS-s.patch
|
|
||||||
Patch2: 0003-dmidecode-Missing-comma-in-the-dmi_slot_type.patch
|
|
||||||
Patch3: 0004-dmidecode-Skip-details-of-uninstalled-memory-modules.patch
|
|
||||||
Patch4: 0005-dmidecode-Add-new-processor-upgrades-from-SMBIOS-spec-3.4.0.patch
|
|
||||||
Patch5: 0006-dmidecode-Add-new-memory-device-types-from-SMBIOS-spec-3.4.0.patch
|
|
||||||
Patch6: 0007-dmidecode-Fix-crash-with-u-option.patch
|
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: gcc make
|
BuildRequires: gcc make
|
||||||
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
|
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
|
||||||
|
|
||||||
|
Patch0: 0001-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch
|
||||||
|
Patch1: 0002-Consistently-use-read_file-when-reading-from-a-dump-.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
dmidecode reports information about x86 & ia64 hardware as described in the
|
dmidecode reports information about x86 & ia64 hardware as described in the
|
||||||
system BIOS according to the SMBIOS/DMI standard. This information
|
system BIOS according to the SMBIOS/DMI standard. This information
|
||||||
@ -31,17 +24,18 @@ slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
|
|||||||
I/O ports (e.g. serial, parallel, USB).
|
I/O ports (e.g. serial, parallel, USB).
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
|
%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man
|
%make_install %{?_smp_mflags} prefix=%{_prefix} install-bin install-man
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS NEWS README
|
%doc AUTHORS NEWS README
|
||||||
%{!?_licensedir:%global license %%doc}
|
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{_sbindir}/dmidecode
|
%{_sbindir}/dmidecode
|
||||||
%ifnarch ia64 aarch64
|
%ifnarch ia64 aarch64
|
||||||
@ -52,55 +46,64 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jan 26 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-4
|
* Fri May 05 2023 Lichen Liuu <lichliu@redhat.com> - 1:3.5-1
|
||||||
- Resolves: rhbz#2042224
|
- updated to upstream v3.5
|
||||||
|
- Resolves: rhbz#2186858
|
||||||
|
|
||||||
* Wed Jan 05 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-3
|
* Wed Jan 05 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-7
|
||||||
- Resolves: rhbz#2027665
|
- Resolves: rhbz#2029784
|
||||||
|
|
||||||
* Tue Nov 10 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-2
|
* Mon Dec 06 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-6
|
||||||
- Resolves: rhbz#1996651
|
- Resolves: rhbz#2024078
|
||||||
|
|
||||||
* Tue Nov 9 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-1
|
* Thu Nov 04 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-4
|
||||||
- Rebase to upsteam 3.3
|
- Resolves: rhbz#1996988
|
||||||
- Resolves: rhbz#1998772
|
|
||||||
|
|
||||||
* Fri Apr 9 2021 Coiby Xu <coxu@redhat.com> - 1:3.2-10
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.3-2
|
||||||
- Fix crash with -u option
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
- Resolves: rhbz#1885823
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Thu Dec 10 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-8
|
* Wed May 19 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-1
|
||||||
- CI found an error in the commit <c54348130a2a>, need to fix it.
|
- updated to upstream v3.3
|
||||||
- Resolves: rhbz#1858350
|
- Supported SMBIOS spec up to v3.3.0
|
||||||
|
|
||||||
* Tue Dec 08 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-7
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.2-10
|
||||||
- Fix the "OUT OF SPEC" error for empty NVMe and DIMM slots
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
- Resolves: rhbz#1858350
|
|
||||||
|
|
||||||
* Wed May 20 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-6
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-9
|
||||||
- Updated to the latest upstream(5b3c8e995026 ("Allow overriding
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
build settings from the environment"))
|
|
||||||
- Resolves: rhbz#1796581
|
|
||||||
|
|
||||||
* Sun Oct 27 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-5
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-8
|
||||||
- Fix the "OUT OF SPEC" for type 9
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
- Resolves: rhbz#1763678
|
|
||||||
|
|
||||||
* Mon Oct 21 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-4
|
* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1:3.2-7
|
||||||
- Updated to the latest upstream(a808e6ef4ebc ("Typo"))
|
- Use make macros
|
||||||
- Resolves: rhbz#1725435
|
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||||
|
|
||||||
* Mon Apr 22 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-3
|
* Mon Feb 03 2020 Tom Stellard <tstellar@redhat.com> - 1:3.2-6
|
||||||
- Add "Logical non-volatile device" to the memory device types
|
- Use make_build macro instead of plain make
|
||||||
- Resolves: rhbz#1664573
|
|
||||||
|
|
||||||
* Mon Apr 15 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-2
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-5
|
||||||
- add CI gating test.
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
- Resolves: rhbz#1680617
|
|
||||||
|
|
||||||
* Wed Sep 19 2018 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-1
|
* Mon Nov 18 2019 Anton Arapov <aarapov@redhat.com> - 1:3.2-4
|
||||||
- update to upstream dmidecode-3.2
|
- v3.2 patched up to upstream commit 62bce59f
|
||||||
- Resolves: rhbz#1628211
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Sep 18 2018 Anton Arapov <aarapov@redhat.com> - 1:3.2-1
|
||||||
|
- updated to upstream v3.2
|
||||||
|
- Supported SMBIOS spec up to v3.2.0
|
||||||
|
|
||||||
|
* Thu Aug 02 2018 Anton Arapov <aarapov@redhat.com> - 1:3.1-7
|
||||||
|
- patched up to upstream commit bd78a5dfd4
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1-5
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
@ -289,4 +292,3 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-
|
|||||||
|
|
||||||
* Sat Dec 18 2004 Dave Jones <davej@redhat.com>
|
* Sat Dec 18 2004 Dave Jones <davej@redhat.com>
|
||||||
- Initial packaging, based upon kernel-utils package.
|
- Initial packaging, based upon kernel-utils package.
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user