diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-21 06:31:35 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-21 15:09:05 +0100 |
| commit | 6882ddc29fda973c0245bc148720efd601f40acd (patch) | |
| tree | 786a05523403589774dcba68c25dea1867f11b16 /rules | |
| parent | a1908d5b4b86f95f84e189a24487513ca326b6b1 (diff) | |
| download | ptxdist-6882ddc29fda973c0245bc148720efd601f40acd.tar.gz ptxdist-6882ddc29fda973c0245bc148720efd601f40acd.tar.xz | |
hardening: add option for -fstack-clash-protection
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/at91bootstrap.make | 1 | ||||
| -rw-r--r-- | rules/at91bootstrap2.make | 1 | ||||
| -rw-r--r-- | rules/barebox.make | 1 | ||||
| -rw-r--r-- | rules/barebox_mlo.make | 1 | ||||
| -rw-r--r-- | rules/grub.make | 1 | ||||
| -rw-r--r-- | rules/kernel.make | 1 | ||||
| -rw-r--r-- | rules/optee.make | 1 | ||||
| -rw-r--r-- | rules/syslinux.make | 4 | ||||
| -rw-r--r-- | rules/templates/template-barebox-make | 1 | ||||
| -rw-r--r-- | rules/templates/template-kernel-make | 1 | ||||
| -rw-r--r-- | rules/u-boot.make | 1 |
11 files changed, 13 insertions, 1 deletions
diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make index 62b736cae..5dd1c2991 100644 --- a/rules/at91bootstrap.make +++ b/rules/at91bootstrap.make @@ -34,6 +34,7 @@ AT91BOOTSTRAP_DIR := $(BUILDDIR)/$(AT91BOOTSTRAP) AT91BOOTSTRAP_WRAPPER_BLACKLIST := \ TARGET_HARDEN_STACK \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make index aae51fe6d..6c149d71b 100644 --- a/rules/at91bootstrap2.make +++ b/rules/at91bootstrap2.make @@ -32,6 +32,7 @@ AT91BOOTSTRAP2_LICENSE := unknown # ---------------------------------------------------------------------------- AT91BOOTSTRAP2_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ diff --git a/rules/barebox.make b/rules/barebox.make index 83a7126cc..f2c2a6419 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -38,6 +38,7 @@ BAREBOX_CONFIG := $(call ptx/in-platformconfigdir, \ BAREBOX_PATH := PATH=$(HOST_PATH) BAREBOX_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make index 368da0e8f..3e096e3aa 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -32,6 +32,7 @@ BAREBOX_MLO_CONFIG := $(call ptx/in-platformconfigdir, \ # ---------------------------------------------------------------------------- BAREBOX_MLO_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ diff --git a/rules/grub.make b/rules/grub.make index 9e02af5d7..8130a8f73 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -38,6 +38,7 @@ GRUB_CFLAGS := -fgnu89-inline GRUB_WRAPPER_BLACKLIST := \ TARGET_HARDEN_STACK \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_FORTIFY \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ diff --git a/rules/kernel.make b/rules/kernel.make index ffcfb9b02..99ad37b85 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -39,6 +39,7 @@ KERNEL_DEVPKG := NO # use CONFIG_CC_STACKPROTECTOR if available. The rest makes no sense for the kernel KERNEL_WRAPPER_BLACKLIST := \ TARGET_HARDEN_STACK \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_FORTIFY \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ diff --git a/rules/optee.make b/rules/optee.make index f308689a7..b7da03803 100644 --- a/rules/optee.make +++ b/rules/optee.make @@ -32,6 +32,7 @@ OPTEE_LICENSE := BSD-2-Clause AND BSD-3-Clause # ---------------------------------------------------------------------------- OPTEE_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_FORTIFY \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ diff --git a/rules/syslinux.make b/rules/syslinux.make index 804c79890..7ef2a9203 100644 --- a/rules/syslinux.make +++ b/rules/syslinux.make @@ -33,7 +33,9 @@ SYSLINUX_MAKE_ENV := \ $(CROSS_ENV) \ ICECC=no -SYSLINUX_WRAPPER_BLACKLIST := TARGET_HARDEN_PIE +SYSLINUX_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ + TARGET_HARDEN_PIE SYSLINUX_MAKE_OPT := $(CROSS_ENV_PROGS) SYSLINUX_INSTALL_OPT := install INSTALLROOT=$(SYSLINUX_PKGDIR) diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make index 6391f4e6b..282de8846 100644 --- a/rules/templates/template-barebox-make +++ b/rules/templates/template-barebox-make @@ -34,6 +34,7 @@ BAREBOX_@PACKAGE@_SOURCE := $(SRCDIR)/$(BAREBOX_@PACKAGE@).$(BAREBOX_@PACKAGE@_S BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH) BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index 11095efc6..6831cdd73 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -32,6 +32,7 @@ KERNEL_@PACKAGE@_SOURCE := $(SRCDIR)/$(KERNEL_@PACKAGE@).$(KERNEL_@PACKAGE@_SUF # use CONFIG_CC_STACKPROTECTOR if available. The rest makes no sense for the kernel KERNEL_@PACKAGE@_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_STACK \ TARGET_HARDEN_FORTIFY \ TARGET_HARDEN_RELRO \ diff --git a/rules/u-boot.make b/rules/u-boot.make index c72a2ea09..55d18b97d 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -35,6 +35,7 @@ endif # ---------------------------------------------------------------------------- U_BOOT_WRAPPER_BLACKLIST := \ + TARGET_HARDEN_STACKCLASH \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ TARGET_HARDEN_PIE \ |