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 <behlendorf1@llnl.gov>
Issues #569

diff --git a/cmd/zvol_id/Makefile.am b/cmd/zvol_id/Makefile.am
index 88ece6b1989fc5a187f443d5a56d5834b0e5086c..5703dd4b83a5cc820ccc82d72d218cb0c9dea045 100644 (file)
--- a/cmd/zvol_id/Makefile.am
+++ b/cmd/zvol_id/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/config/Rules.am
 
+# 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 += -fno-stack-protector
+
 DEFAULT_INCLUDES += \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/lib/libspl/include

diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index 8a8f85d8e94a5068d1c38b96e8019823b6a06760..57064c3105d5ad9864946a54fc429eccb2310437 100644 (file)
--- 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