summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2017-06-30 11:20:05 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-07-04 14:53:40 +1000
commit9b02b06b60ca891bea2ff25d71aa9bf2d3a3a5bf (patch)
tree8fc4eb1174166f9cfe116fc261819bac4f66a7ca
parent598d2903bd6d46efab42b757794a3213cd41ba39 (diff)
downloadlinux-9b02b06b60ca891bea2ff25d71aa9bf2d3a3a5bf.tar.gz
linux-9b02b06b60ca891bea2ff25d71aa9bf2d3a3a5bf.tar.xz
powerpc: don't fortify prom_init
prom_init is a bit special; in theory it should be able to be linked separately to the kernel. To keep this from getting too complex, the symbols that prom_init.c uses are checked. Fortification adds symbols, and it gets quite messy as it includes things like panic(). So just don't fortify prom_init.c for now. Link: http://lkml.kernel.org/r/1497903987-21002-6-git-send-email-keescook@chromium.org Signed-off-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Michael Ellerman <mpe@ellerman.id.au> Cc: Daniel Micay <danielmicay@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--arch/powerpc/kernel/prom_init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index dd8a04f3053a..613f79f03877 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -15,6 +15,9 @@
#undef DEBUG_PROM
+/* we cannot use FORTIFY as it brings in new symbols */
+#define __NO_FORTIFY
+
#include <stdarg.h>
#include <linux/kernel.h>
#include <linux/string.h>