Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Brian Behlendorf 2012-06-13 11:21:16 -07:00
parent ee191e802c
commit fe2fc8f6d3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zvol_id/Makefile.am
View File

@ -1,5 +1,9 @@
include $(top_srcdir)/config/Rules.am 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 += \ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include -I$(top_srcdir)/lib/libspl/include

5
cmd/zvol_id/Makefile.in
View File

@ -324,11 +324,14 @@ udevruledir = @udevruledir@
DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
-I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
AM_LIBTOOLFLAGS = --silent 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 \ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS} -D_GNU_SOURCE \ ${NO_UNUSED_BUT_SET_VARIABLE} ${DEBUG_CFLAGS} -D_GNU_SOURCE \
-D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \ -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-DTEXT_DOMAIN=\"zfs-linux-user\" -DTEXT_DOMAIN=\"zfs-linux-user\" -fno-stack-protector
zvol_id_SOURCES = \ zvol_id_SOURCES = \
$(top_srcdir)/cmd/zvol_id/zvol_id_main.c $(top_srcdir)/cmd/zvol_id/zvol_id_main.c