import UBI dmidecode-3.3-4.el8_8.1
This commit is contained in:
eabdullin
parent
807cdbf23c
commit
ff9e432cc5
230
SOURCES/0008-dmidecode-Split-table-fetching-from-decoding.patch
Normal file
230
SOURCES/0008-dmidecode-Split-table-fetching-from-decoding.patch
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
From 8c3a5e0d6578ebda64362d2345ba824167bacd20 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Mon, 20 Feb 2023 14:53:21 +0100
|
||||||
|
Subject: [PATCH 1/3] dmidecode: Split table fetching from decoding
|
||||||
|
|
||||||
|
Clean up function dmi_table so that it does only one thing:
|
||||||
|
* dmi_table() is renamed to dmi_table_get(). It now retrieves the
|
||||||
|
DMI table, but does not process it any longer.
|
||||||
|
* Decoding or dumping the table is now done in smbios3_decode(),
|
||||||
|
smbios_decode() and legacy_decode().
|
||||||
|
No functional change.
|
||||||
|
|
||||||
|
A side effect of this change is that writing the header and body of
|
||||||
|
dump files is now done in a single location. This is required to
|
||||||
|
further consolidate the writing of dump files.
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>
|
||||||
|
---
|
||||||
|
dmidecode.c | 86 ++++++++++++++++++++++++++++++++++++++---------------
|
||||||
|
1 file changed, 62 insertions(+), 24 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmidecode.c b/dmidecode.c
|
||||||
|
index 4c98553..f743db3 100644
|
||||||
|
--- a/dmidecode.c
|
||||||
|
+++ b/dmidecode.c
|
||||||
|
@@ -5287,8 +5287,9 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
|
||||||
|
- u32 flags)
|
||||||
|
+/* Allocates a buffer for the table, must be freed by the caller */
|
||||||
|
+static u8 *dmi_table_get(off_t base, u32 *len, u16 num, u32 ver,
|
||||||
|
+ const char *devmem, u32 flags)
|
||||||
|
{
|
||||||
|
u8 *buf;
|
||||||
|
|
||||||
|
@@ -5307,7 +5308,7 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
|
||||||
|
{
|
||||||
|
if (num)
|
||||||
|
pr_info("%u structures occupying %u bytes.",
|
||||||
|
- num, len);
|
||||||
|
+ num, *len);
|
||||||
|
if (!(opt.flags & FLAG_FROM_DUMP))
|
||||||
|
pr_info("Table at 0x%08llX.",
|
||||||
|
(unsigned long long)base);
|
||||||
|
@@ -5325,19 +5326,19 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
|
||||||
|
* would be the result of the kernel truncating the table on
|
||||||
|
* parse error.
|
||||||
|
*/
|
||||||
|
- size_t size = len;
|
||||||
|
+ size_t size = *len;
|
||||||
|
buf = read_file(flags & FLAG_NO_FILE_OFFSET ? 0 : base,
|
||||||
|
&size, devmem);
|
||||||
|
- if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)len)
|
||||||
|
+ if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)*len)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Wrong DMI structures length: %u bytes "
|
||||||
|
"announced, only %lu bytes available.\n",
|
||||||
|
- len, (unsigned long)size);
|
||||||
|
+ *len, (unsigned long)size);
|
||||||
|
}
|
||||||
|
- len = size;
|
||||||
|
+ *len = size;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
- buf = mem_chunk(base, len, devmem);
|
||||||
|
+ buf = mem_chunk(base, *len, devmem);
|
||||||
|
|
||||||
|
if (buf == NULL)
|
||||||
|
{
|
||||||
|
@@ -5347,15 +5348,9 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
|
||||||
|
fprintf(stderr,
|
||||||
|
"Try compiling dmidecode with -DUSE_MMAP.\n");
|
||||||
|
#endif
|
||||||
|
- return;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (opt.flags & FLAG_DUMP_BIN)
|
||||||
|
- dmi_table_dump(buf, len);
|
||||||
|
- else
|
||||||
|
- dmi_table_decode(buf, len, num, ver >> 8, flags);
|
||||||
|
-
|
||||||
|
- free(buf);
|
||||||
|
+ return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -5390,8 +5385,9 @@ static void overwrite_smbios3_address(u8 *buf)
|
||||||
|
|
||||||
|
static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
{
|
||||||
|
- u32 ver;
|
||||||
|
+ u32 ver, len;
|
||||||
|
u64 offset;
|
||||||
|
+ u8 *table;
|
||||||
|
|
||||||
|
/* Don't let checksum run beyond the buffer */
|
||||||
|
if (buf[0x06] > 0x20)
|
||||||
|
@@ -5417,8 +5413,12 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- dmi_table(((off_t)offset.h << 32) | offset.l,
|
||||||
|
- DWORD(buf + 0x0C), 0, ver, devmem, flags | FLAG_STOP_AT_EOT);
|
||||||
|
+ /* Maximum length, may get trimmed */
|
||||||
|
+ len = DWORD(buf + 0x0C);
|
||||||
|
+ table = dmi_table_get(((off_t)offset.h << 32) | offset.l, &len, 0, ver,
|
||||||
|
+ devmem, flags | FLAG_STOP_AT_EOT);
|
||||||
|
+ if (table == NULL)
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
if (opt.flags & FLAG_DUMP_BIN)
|
||||||
|
{
|
||||||
|
@@ -5427,18 +5427,28 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 32);
|
||||||
|
overwrite_smbios3_address(crafted);
|
||||||
|
|
||||||
|
+ dmi_table_dump(table, len);
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
pr_comment("Writing %d bytes to %s.", crafted[0x06],
|
||||||
|
opt.dumpfile);
|
||||||
|
write_dump(0, crafted[0x06], crafted, opt.dumpfile, 1);
|
||||||
|
}
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ dmi_table_decode(table, len, 0, ver >> 8,
|
||||||
|
+ flags | FLAG_STOP_AT_EOT);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(table);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int smbios_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
{
|
||||||
|
- u16 ver;
|
||||||
|
+ u16 ver, num;
|
||||||
|
+ u32 len;
|
||||||
|
+ u8 *table;
|
||||||
|
|
||||||
|
/* Don't let checksum run beyond the buffer */
|
||||||
|
if (buf[0x05] > 0x20)
|
||||||
|
@@ -5478,8 +5488,13 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
pr_info("SMBIOS %u.%u present.",
|
||||||
|
ver >> 8, ver & 0xFF);
|
||||||
|
|
||||||
|
- dmi_table(DWORD(buf + 0x18), WORD(buf + 0x16), WORD(buf + 0x1C),
|
||||||
|
- ver << 8, devmem, flags);
|
||||||
|
+ /* Maximum length, may get trimmed */
|
||||||
|
+ len = WORD(buf + 0x16);
|
||||||
|
+ num = WORD(buf + 0x1C);
|
||||||
|
+ table = dmi_table_get(DWORD(buf + 0x18), &len, num, ver << 8,
|
||||||
|
+ devmem, flags);
|
||||||
|
+ if (table == NULL)
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
if (opt.flags & FLAG_DUMP_BIN)
|
||||||
|
{
|
||||||
|
@@ -5488,27 +5503,43 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 32);
|
||||||
|
overwrite_dmi_address(crafted + 0x10);
|
||||||
|
|
||||||
|
+ dmi_table_dump(table, len);
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
pr_comment("Writing %d bytes to %s.", crafted[0x05],
|
||||||
|
opt.dumpfile);
|
||||||
|
write_dump(0, crafted[0x05], crafted, opt.dumpfile, 1);
|
||||||
|
}
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ dmi_table_decode(table, len, num, ver, flags);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(table);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int legacy_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
{
|
||||||
|
+ u16 ver, num;
|
||||||
|
+ u32 len;
|
||||||
|
+ u8 *table;
|
||||||
|
+
|
||||||
|
if (!checksum(buf, 0x0F))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
+ ver = ((buf[0x0E] & 0xF0) << 4) + (buf[0x0E] & 0x0F);
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
pr_info("Legacy DMI %u.%u present.",
|
||||||
|
buf[0x0E] >> 4, buf[0x0E] & 0x0F);
|
||||||
|
|
||||||
|
- dmi_table(DWORD(buf + 0x08), WORD(buf + 0x06), WORD(buf + 0x0C),
|
||||||
|
- ((buf[0x0E] & 0xF0) << 12) + ((buf[0x0E] & 0x0F) << 8),
|
||||||
|
- devmem, flags);
|
||||||
|
+ /* Maximum length, may get trimmed */
|
||||||
|
+ len = WORD(buf + 0x06);
|
||||||
|
+ num = WORD(buf + 0x0C);
|
||||||
|
+ table = dmi_table_get(DWORD(buf + 0x08), &len, num, ver << 8,
|
||||||
|
+ devmem, flags);
|
||||||
|
+ if (table == NULL)
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
if (opt.flags & FLAG_DUMP_BIN)
|
||||||
|
{
|
||||||
|
@@ -5517,11 +5548,18 @@ static int legacy_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 16);
|
||||||
|
overwrite_dmi_address(crafted);
|
||||||
|
|
||||||
|
+ dmi_table_dump(table, len);
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
pr_comment("Writing %d bytes to %s.", 0x0F,
|
||||||
|
opt.dumpfile);
|
||||||
|
write_dump(0, 0x0F, crafted, opt.dumpfile, 1);
|
||||||
|
}
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ dmi_table_decode(table, len, num, ver, flags);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(table);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
191
SOURCES/0009-dmidecode-Write-the-whole-dump-file-at-once.patch
Normal file
191
SOURCES/0009-dmidecode-Write-the-whole-dump-file-at-once.patch
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
From d7dff2691ab3df03a3d7ddda6be714a57ce2fec9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Mon, 20 Feb 2023 14:53:25 +0100
|
||||||
|
Subject: [PATCH 2/3] dmidecode: Write the whole dump file at once
|
||||||
|
|
||||||
|
When option --dump-bin is used, write the whole dump file at once,
|
||||||
|
instead of opening and closing the file separately for the table
|
||||||
|
and then for the entry point.
|
||||||
|
|
||||||
|
As the file writing function is no longer generic, it gets moved
|
||||||
|
from util.c to dmidecode.c.
|
||||||
|
|
||||||
|
One minor functional change resulting from the new implementation is
|
||||||
|
that the entry point is written first now, so the messages printed
|
||||||
|
are swapped.
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>
|
||||||
|
---
|
||||||
|
dmidecode.c | 69 +++++++++++++++++++++++++++++++++++++++--------------
|
||||||
|
util.c | 40 -------------------------------
|
||||||
|
util.h | 1 -
|
||||||
|
3 files changed, 51 insertions(+), 59 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmidecode.c b/dmidecode.c
|
||||||
|
index f743db3..cfc7672 100644
|
||||||
|
--- a/dmidecode.c
|
||||||
|
+++ b/dmidecode.c
|
||||||
|
@@ -5170,11 +5170,56 @@ static void dmi_table_string(const struct dmi_header *h, const u8 *data, u16 ver
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void dmi_table_dump(const u8 *buf, u32 len)
|
||||||
|
+static int dmi_table_dump(const u8 *ep, u32 ep_len, const u8 *table,
|
||||||
|
+ u32 table_len)
|
||||||
|
{
|
||||||
|
+ FILE *f;
|
||||||
|
+
|
||||||
|
+ f = fopen(opt.dumpfile, "wb");
|
||||||
|
+ if (!f)
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("fopen");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (!(opt.flags & FLAG_QUIET))
|
||||||
|
+ pr_comment("Writing %d bytes to %s.", ep_len, opt.dumpfile);
|
||||||
|
+ if (fwrite(ep, ep_len, 1, f) != 1)
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("fwrite");
|
||||||
|
+ goto err_close;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (fseek(f, 32, SEEK_SET) != 0)
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("fseek");
|
||||||
|
+ goto err_close;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (!(opt.flags & FLAG_QUIET))
|
||||||
|
- pr_comment("Writing %d bytes to %s.", len, opt.dumpfile);
|
||||||
|
- write_dump(32, len, buf, opt.dumpfile, 0);
|
||||||
|
+ pr_comment("Writing %d bytes to %s.", table_len, opt.dumpfile);
|
||||||
|
+ if (fwrite(table, table_len, 1, f) != 1)
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("fwrite");
|
||||||
|
+ goto err_close;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (fclose(f))
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("fclose");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+err_close:
|
||||||
|
+ fclose(f);
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags)
|
||||||
|
@@ -5427,11 +5472,7 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 32);
|
||||||
|
overwrite_smbios3_address(crafted);
|
||||||
|
|
||||||
|
- dmi_table_dump(table, len);
|
||||||
|
- if (!(opt.flags & FLAG_QUIET))
|
||||||
|
- pr_comment("Writing %d bytes to %s.", crafted[0x06],
|
||||||
|
- opt.dumpfile);
|
||||||
|
- write_dump(0, crafted[0x06], crafted, opt.dumpfile, 1);
|
||||||
|
+ dmi_table_dump(crafted, crafted[0x06], table, len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -5503,11 +5544,7 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 32);
|
||||||
|
overwrite_dmi_address(crafted + 0x10);
|
||||||
|
|
||||||
|
- dmi_table_dump(table, len);
|
||||||
|
- if (!(opt.flags & FLAG_QUIET))
|
||||||
|
- pr_comment("Writing %d bytes to %s.", crafted[0x05],
|
||||||
|
- opt.dumpfile);
|
||||||
|
- write_dump(0, crafted[0x05], crafted, opt.dumpfile, 1);
|
||||||
|
+ dmi_table_dump(crafted, crafted[0x05], table, len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -5548,11 +5585,7 @@ static int legacy_decode(u8 *buf, const char *devmem, u32 flags)
|
||||||
|
memcpy(crafted, buf, 16);
|
||||||
|
overwrite_dmi_address(crafted);
|
||||||
|
|
||||||
|
- dmi_table_dump(table, len);
|
||||||
|
- if (!(opt.flags & FLAG_QUIET))
|
||||||
|
- pr_comment("Writing %d bytes to %s.", 0x0F,
|
||||||
|
- opt.dumpfile);
|
||||||
|
- write_dump(0, 0x0F, crafted, opt.dumpfile, 1);
|
||||||
|
+ dmi_table_dump(crafted, 0x0F, table, len);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
diff --git a/util.c b/util.c
|
||||||
|
index 04aaadd..1547096 100644
|
||||||
|
--- a/util.c
|
||||||
|
+++ b/util.c
|
||||||
|
@@ -259,46 +259,6 @@ void *mem_chunk(off_t base, size_t len, const char *devmem)
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
-int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add)
|
||||||
|
-{
|
||||||
|
- FILE *f;
|
||||||
|
-
|
||||||
|
- f = fopen(dumpfile, add ? "r+b" : "wb");
|
||||||
|
- if (!f)
|
||||||
|
- {
|
||||||
|
- fprintf(stderr, "%s: ", dumpfile);
|
||||||
|
- perror("fopen");
|
||||||
|
- return -1;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (fseek(f, base, SEEK_SET) != 0)
|
||||||
|
- {
|
||||||
|
- fprintf(stderr, "%s: ", dumpfile);
|
||||||
|
- perror("fseek");
|
||||||
|
- goto err_close;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (fwrite(data, len, 1, f) != 1)
|
||||||
|
- {
|
||||||
|
- fprintf(stderr, "%s: ", dumpfile);
|
||||||
|
- perror("fwrite");
|
||||||
|
- goto err_close;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (fclose(f))
|
||||||
|
- {
|
||||||
|
- fprintf(stderr, "%s: ", dumpfile);
|
||||||
|
- perror("fclose");
|
||||||
|
- return -1;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return 0;
|
||||||
|
-
|
||||||
|
-err_close:
|
||||||
|
- fclose(f);
|
||||||
|
- return -1;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/* Returns end - start + 1, assuming start < end */
|
||||||
|
u64 u64_range(u64 start, u64 end)
|
||||||
|
{
|
||||||
|
diff --git a/util.h b/util.h
|
||||||
|
index 3094cf8..ef24eb9 100644
|
||||||
|
--- a/util.h
|
||||||
|
+++ b/util.h
|
||||||
|
@@ -27,5 +27,4 @@
|
||||||
|
int checksum(const u8 *buf, size_t len);
|
||||||
|
void *read_file(off_t base, size_t *len, const char *filename);
|
||||||
|
void *mem_chunk(off_t base, size_t len, const char *devmem);
|
||||||
|
-int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add);
|
||||||
|
u64 u64_range(u64 start, u64 end);
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
From 84c0bf52d15a6d9d4cb3a1369320b5d653217c6b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Date: Mon, 20 Feb 2023 14:53:31 +0100
|
||||||
|
Subject: [PATCH] dmidecode: Do not let --dump-bin overwrite an existing file
|
||||||
|
|
||||||
|
Make sure that the file passed to option --dump-bin does not already
|
||||||
|
exist. In practice, it is rather unlikely that an honest user would
|
||||||
|
want to overwrite an existing dump file, while this possibility
|
||||||
|
could be used by a rogue user to corrupt a system file.
|
||||||
|
|
||||||
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||||
|
Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>
|
||||||
|
---
|
||||||
|
dmidecode.c | 14 ++++++++++++--
|
||||||
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmidecode.c b/dmidecode.c
|
||||||
|
index 9d22b72..f4cde27 100644
|
||||||
|
--- a/dmidecode.c
|
||||||
|
+++ b/dmidecode.c
|
||||||
|
@@ -60,6 +60,7 @@
|
||||||
|
* https://www.dmtf.org/sites/default/files/DSP0270_1.0.1.pdf
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#include <fcntl.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <strings.h>
|
||||||
|
@@ -5156,13 +5157,22 @@ static void dmi_table_string(const struct dmi_header *h, const u8 *data, u16 ver
|
||||||
|
static int dmi_table_dump(const u8 *ep, u32 ep_len, const u8 *table,
|
||||||
|
u32 table_len)
|
||||||
|
{
|
||||||
|
+ int fd;
|
||||||
|
FILE *f;
|
||||||
|
|
||||||
|
- f = fopen(opt.dumpfile, "wb");
|
||||||
|
+ fd = open(opt.dumpfile, O_WRONLY|O_CREAT|O_EXCL, 0666);
|
||||||
|
+ if (fd == -1)
|
||||||
|
+ {
|
||||||
|
+ fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
+ perror("open");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ f = fdopen(fd, "wb");
|
||||||
|
if (!f)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: ", opt.dumpfile);
|
||||||
|
- perror("fopen");
|
||||||
|
+ perror("fdopen");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.40.1
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: Tool to analyse BIOS DMI data
|
Summary: Tool to analyse BIOS DMI data
|
||||||
Name: dmidecode
|
Name: dmidecode
|
||||||
Version: 3.3
|
Version: 3.3
|
||||||
Release: 4%{?dist}
|
Release: 4%{?dist}.1
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
|
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
|
||||||
@ -14,7 +14,9 @@ Patch3: 0004-dmidecode-Skip-details-of-uninstalled-memory-modules.patch
|
|||||||
Patch4: 0005-dmidecode-Add-new-processor-upgrades-from-SMBIOS-spec-3.4.0.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
|
Patch5: 0006-dmidecode-Add-new-memory-device-types-from-SMBIOS-spec-3.4.0.patch
|
||||||
Patch6: 0007-dmidecode-Fix-crash-with-u-option.patch
|
Patch6: 0007-dmidecode-Fix-crash-with-u-option.patch
|
||||||
|
Patch7: 0008-dmidecode-Split-table-fetching-from-decoding.patch
|
||||||
|
Patch8: 0009-dmidecode-Write-the-whole-dump-file-at-once.patch
|
||||||
|
Patch9: 0010-dmidecode-Do-not-let-dump-bin-overwrite-an-existing-.patch
|
||||||
|
|
||||||
BuildRequires: gcc make
|
BuildRequires: gcc make
|
||||||
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
|
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
|
||||||
@ -52,6 +54,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 09 2023 Lichen Liu <lichliu@redhat.com> - 1:3.3-4.1
|
||||||
|
- Resolves: rhbz#2186859
|
||||||
|
|
||||||
* Wed Jan 26 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-4
|
* Wed Jan 26 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-4
|
||||||
- Resolves: rhbz#2042224
|
- Resolves: rhbz#2042224
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user