aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/zvol_id/Makefile.in
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2012-06-13 11:21:16 -0700
committerBrian Behlendorf <[email protected]>2012-06-13 11:25:17 -0700
commitfe2fc8f6d383f1621446f98bb277c12f6b457b8f (patch)
tree692c78ce7fb039afff702d8f91f29bf7a6d85875 /cmd/zvol_id/Makefile.in
parentee191e802c515ae509aec382cac33c9d89235dc5 (diff)
Workaround for failing zvol_id
This is not a proper fix. It is just a workaround for the stack smashing detected by gcc in zvol_id. We simply disable the gcc stack protector for now when building the zvol_id udev helper. Once the root cause is resolved this patch should be reverted. Signed-off-by: Brian Behlendorf <[email protected]> Issues #569
Diffstat (limited to 'cmd/zvol_id/Makefile.in')
-rw-r--r--cmd/zvol_id/Makefile.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index 8a8f85d8e..57064c310 100644
--- a/cmd/zvol_id/Makefile.in
+++ b/cmd/zvol_id/Makefile.in
@@ -324,11 +324,14 @@ udevruledir = @udevruledir@
DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
-I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
AM_LIBTOOLFLAGS = --silent
+
+# Disable GCC stack protection for zvol_id. This is a kludge and should be
+# removed once https://github.com/zfsonlinux/zfs/issues/569 is resolved.
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS} -D_GNU_SOURCE \
-D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
- -DTEXT_DOMAIN=\"zfs-linux-user\"
+ -DTEXT_DOMAIN=\"zfs-linux-user\" -fno-stack-protector
zvol_id_SOURCES = \
$(top_srcdir)/cmd/zvol_id/zvol_id_main.c