diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-04-27 05:11:55 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-04-27 05:46:22 +0000 |
| commit | 43a9721d269bdcd4e863248474ae2601f2f53548 (patch) | |
| tree | 23f30794ef2e2926cdef5bc18a9e1e2df9f28e71 /main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch | |
| parent | 34cb8cea11aa9f398dac2b93b344c8531e4ba9dc (diff) | |
| download | aports-43a9721d269bdcd4e863248474ae2601f2f53548.tar.bz2 aports-43a9721d269bdcd4e863248474ae2601f2f53548.tar.xz | |
main/zfs-hardened: rename from zfs-grsec, provide zfs-grsec
Diffstat (limited to 'main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch')
| -rw-r--r-- | main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch b/main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch new file mode 100644 index 0000000000..aaae11f58a --- /dev/null +++ b/main/zfs-hardened/0001-Use-the-correct-macro-to-include-backtrace.patch @@ -0,0 +1,42 @@ +From b8fd863517ae6dba1f4bdf225f45b97eb913e09e Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Tue, 1 Mar 2016 15:23:09 +0100 +Subject: [PATCH 1/8] Use the correct macro to include backtrace + +execinfo.h and backtrace() are GNU extensions provided by glibc +and not by gcc, see: + +http://www.gnu.org/software/libc/manual/html_mono/libc.html#Backtraces + +Signed-off-by: Carlo Landmeter <clandmeter@gmail.com> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #4453 +--- + cmd/ztest/ztest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c +index afe6faa..40524ed 100644 +--- a/cmd/ztest/ztest.c ++++ b/cmd/ztest/ztest.c +@@ -123,7 +123,7 @@ + #include <math.h> + #include <sys/fs/zfs.h> + #include <libnvpair.h> +-#ifdef __GNUC__ ++#ifdef __GLIBC__ + #include <execinfo.h> /* for backtrace() */ + #endif + +@@ -490,7 +490,7 @@ _umem_logging_init(void) + static void sig_handler(int signo) + { + struct sigaction action; +-#ifdef __GNUC__ /* backtrace() is a GNU extension */ ++#ifdef __GLIBC__ /* backtrace() is a GNU extension */ + int nptrs; + void *buffer[BACKTRACE_SZ]; + +-- +2.7.4 + |