summaryrefslogtreecommitdiffstats
path: root/source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.xz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch')
-rw-r--r--source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch b/source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch
deleted file mode 100644
index 6af8b3221..000000000
--- a/source/ap/dmidecode/patches/0009-dmidecode-Check-sysfs-entry-point-length.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e5c73239404931d4d1b73eb595c3802fbce74c61 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Mon, 2 Nov 2015 09:45:36 +0100
-Subject: [PATCH 9/9] dmidecode: Check sysfs entry point length
-
-Before passing the sysfs entry point data over for decoding, check
-that its length meets the expectations.
----
- CHANGELOG | 1 +
- dmidecode.c | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index fcfc244..ba61cab 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -5,6 +5,7 @@
- * dmidecode.c: Use read_file to read the DMI table from sysfs.
- This fixes Savannah bug #46176:
- https://savannah.nongnu.org/bugs/?46176
-+ * dmidecode.c: Check the sysfs entry point length.
-
- 2015-10-21 Xie XiuQi <xiexiuqi@huawei.com>
-
-diff --git a/dmidecode.c b/dmidecode.c
-index 16d1823..b47c469 100644
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -4840,17 +4840,17 @@ int main(int argc, char * const argv[])
- {
- if (!(opt.flags & FLAG_QUIET))
- printf("Getting SMBIOS data from sysfs.\n");
-- if (memcmp(buf, "_SM3_", 5) == 0)
-+ if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0)
- {
- if (smbios3_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
- found++;
- }
-- else if (memcmp(buf, "_SM_", 4) == 0)
-+ else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0)
- {
- if (smbios_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
- found++;
- }
-- else if (memcmp(buf, "_DMI_", 5) == 0)
-+ else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0)
- {
- if (legacy_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET))
- found++;
---
-2.6.4
-