summaryrefslogtreecommitdiffstats
path: root/source/ap/dmidecode/patches/0002-Avoid-SIGBUS-on-mmap-failure.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/0002-Avoid-SIGBUS-on-mmap-failure.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/0002-Avoid-SIGBUS-on-mmap-failure.patch')
-rw-r--r--source/ap/dmidecode/patches/0002-Avoid-SIGBUS-on-mmap-failure.patch74
1 files changed, 0 insertions, 74 deletions
diff --git a/source/ap/dmidecode/patches/0002-Avoid-SIGBUS-on-mmap-failure.patch b/source/ap/dmidecode/patches/0002-Avoid-SIGBUS-on-mmap-failure.patch
deleted file mode 100644
index 924a2ffef..000000000
--- a/source/ap/dmidecode/patches/0002-Avoid-SIGBUS-on-mmap-failure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From c081fa410e7c466df4b3b257e7b974b71fb7f250 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Wed, 14 Oct 2015 14:37:04 +0200
-Subject: [PATCH 2/9] Avoid SIGBUS on mmap failure
-
-mmap will fail with SIGBUS if trying to map a non-existent portion of
-a file. While this should never happen with /dev/mem, it can happen if
-passing a regular file with option -d. While people should no longer
-do that, failure gracefully seems better than crashing. So check for
-the file size before calling mmap.
-
-This closes bug #46066:
-http://savannah.nongnu.org/bugs/?46066
----
- CHANGELOG | 6 ++++++
- util.c | 21 +++++++++++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 42d815c..aa1c28f 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,3 +1,9 @@
-+2015-10-14 Jean Delvare <jdelvare@suse.de>
-+
-+ * util.c: Avoid SIGBUS on mmap failure.
-+ This fixes Savannah bug #46066:
-+ https://savannah.nongnu.org/bugs/?46066
-+
- 2015-10-01 Roy Franz <roy.franz@linaro.org>
-
- * dmiopt.c: Add "--no-sysfs" option description to -h output.
-diff --git a/util.c b/util.c
-index 8cafe5c..5795d02 100644
---- a/util.c
-+++ b/util.c
-@@ -152,6 +152,7 @@ void *mem_chunk(off_t base, size_t len, const char *devmem)
- void *p;
- int fd;
- #ifdef USE_MMAP
-+ struct stat statbuf;
- off_t mmoffset;
- void *mmp;
- #endif
-@@ -169,6 +170,26 @@ void *mem_chunk(off_t base, size_t len, const char *devmem)
- }
-
- #ifdef USE_MMAP
-+ if (fstat(fd, &statbuf) == -1)
-+ {
-+ fprintf(stderr, "%s: ", devmem);
-+ perror("stat");
-+ free(p);
-+ return NULL;
-+ }
-+
-+ /*
-+ * mmap() will fail with SIGBUS if trying to map beyond the end of
-+ * the file.
-+ */
-+ if (S_ISREG(statbuf.st_mode) && base + (off_t)len > statbuf.st_size)
-+ {
-+ fprintf(stderr, "mmap: Can't map beyond end of file %s\n",
-+ devmem);
-+ free(p);
-+ return NULL;
-+ }
-+
- #ifdef _SC_PAGESIZE
- mmoffset = base % sysconf(_SC_PAGESIZE);
- #else
---
-2.6.4
-