From 63f2375fe4c3075e066400175a2c8a74469a7f5a Mon Sep 17 00:00:00 2001 From: Tony Battersby Date: Mon, 8 Sep 2025 16:00:19 +0300 Subject: [PATCH] kbuild: Remove stack protector flags -fstack-protector-strong is controlled by the in-tree CONFIG_STACKPROTECTOR_STRONG config option. If the flag is set without the config option, scst fails to build: ERROR: modpost: "__stack_chk_fail" [scst/src/scst.ko] undefined! -fstack-clash-protection is disabled in the kernel's Makefile due to an incompatibility with randomize_kstack_offset. Fixes: 86d3d4bb1d14 ("kbuild: Enable additional compiler warnings") Signed-off-by: Tony Battersby --- fcst/Kbuild | 2 -- iscsi-scst/kernel/Kbuild | 2 -- iscsi-scst/kernel/isert-scst/Kbuild | 2 -- qla2x00t-32gbit/Kbuild | 2 -- qla2x00t-32gbit/qla2x00-target/Kbuild | 2 -- qla2x00t/Kbuild | 2 -- qla2x00t/qla2x00-target/Kbuild | 2 -- scst/src/Kbuild | 2 -- scst/src/dev_handlers/Kbuild | 2 -- scst_local/Kbuild | 2 -- srpt/src/Kbuild | 2 -- 11 files changed, 22 deletions(-) diff --git a/fcst/Kbuild b/fcst/Kbuild index f9e3611c6..c4fc95684 100644 --- a/fcst/Kbuild +++ b/fcst/Kbuild @@ -14,8 +14,6 @@ ccflags-y += -Wall \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes obj-$(CONFIG_FCST) += fcst.o diff --git a/iscsi-scst/kernel/Kbuild b/iscsi-scst/kernel/Kbuild index 6fa853e09..499d82553 100644 --- a/iscsi-scst/kernel/Kbuild +++ b/iscsi-scst/kernel/Kbuild @@ -30,8 +30,6 @@ ccflags-y := -I$(src)/../include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes ccflags-y += $(CONFTEST_CFLAGS) diff --git a/iscsi-scst/kernel/isert-scst/Kbuild b/iscsi-scst/kernel/isert-scst/Kbuild index e6ecfa6dc..94bb3e836 100644 --- a/iscsi-scst/kernel/isert-scst/Kbuild +++ b/iscsi-scst/kernel/isert-scst/Kbuild @@ -35,8 +35,6 @@ ccflags-y := -I$(src)/../../../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes obj-m += isert-scst.o diff --git a/qla2x00t-32gbit/Kbuild b/qla2x00t-32gbit/Kbuild index 31cb0591f..beab2ee01 100644 --- a/qla2x00t-32gbit/Kbuild +++ b/qla2x00t-32gbit/Kbuild @@ -11,8 +11,6 @@ ccflags-y := -I$(src)/../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),) diff --git a/qla2x00t-32gbit/qla2x00-target/Kbuild b/qla2x00t-32gbit/qla2x00-target/Kbuild index 24251e354..0ceae4268 100644 --- a/qla2x00t-32gbit/qla2x00-target/Kbuild +++ b/qla2x00t-32gbit/qla2x00-target/Kbuild @@ -14,8 +14,6 @@ ccflags-y := -I$(src)/../../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD diff --git a/qla2x00t/Kbuild b/qla2x00t/Kbuild index e3deaec83..12a67aa21 100644 --- a/qla2x00t/Kbuild +++ b/qla2x00t/Kbuild @@ -11,8 +11,6 @@ ccflags-y := -I$(src)/../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),) diff --git a/qla2x00t/qla2x00-target/Kbuild b/qla2x00t/qla2x00-target/Kbuild index 9f78e1bf7..f34982b44 100644 --- a/qla2x00t/qla2x00-target/Kbuild +++ b/qla2x00t/qla2x00-target/Kbuild @@ -14,8 +14,6 @@ ccflags-y := -I$(src)/../../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes #ccflags-y += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD diff --git a/scst/src/Kbuild b/scst/src/Kbuild index 94d5af70d..60c962f9d 100644 --- a/scst/src/Kbuild +++ b/scst/src/Kbuild @@ -11,8 +11,6 @@ ccflags-y := -I$(src)/../include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes ccflags-y += $(shell [ -n "${BUILD_DATE}" ] && echo -DSCST_BUILD_DATE=${BUILD_DATE}) \ diff --git a/scst/src/dev_handlers/Kbuild b/scst/src/dev_handlers/Kbuild index 8a813a10e..f9d9c23c8 100644 --- a/scst/src/dev_handlers/Kbuild +++ b/scst/src/dev_handlers/Kbuild @@ -13,8 +13,6 @@ ccflags-y := -I$(src)/../../include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes #ccflags-y += -DCONFIG_DEBUG_EXT_COPY_REMAP diff --git a/scst_local/Kbuild b/scst_local/Kbuild index 0e9a878f8..3cf7804af 100644 --- a/scst_local/Kbuild +++ b/scst_local/Kbuild @@ -13,8 +13,6 @@ ccflags-y := -I$(src)/../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes obj-m := scst_local.o diff --git a/srpt/src/Kbuild b/srpt/src/Kbuild index 6962b2631..034b10d06 100644 --- a/srpt/src/Kbuild +++ b/srpt/src/Kbuild @@ -16,8 +16,6 @@ ccflags-y += -I$(src)/../../scst/include \ -pipe \ -g \ -grecord-gcc-switches \ - -fstack-clash-protection \ - -fstack-protector-strong \ -Wstrict-prototypes obj-m += ib_srpt.o