From: Kees Cook Date: Tue, 26 Jan 2016 00:18:13 +0000 (+0100) Subject: UPSTREAM: ARM: 8500/1: fix atags_to_fdt with stack-protector-strong X-Git-Tag: release-20171130_firefly~4^2~457 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3e98da1d4c385c7c35b154a439ec73148fc82a7;p=firefly-linux-kernel-4.4.55.git UPSTREAM: ARM: 8500/1: fix atags_to_fdt with stack-protector-strong Building with CONFIG_CC_STACKPROTECTOR_STRONG triggers protection code generation under CONFIG_ARM_ATAG_DTB_COMPAT but this is too early for being able to use any of the stack_chk code. Explicitly disable it for only the atags_to_fdt bits. Change-Id: Ib1f66cc4083b4f04d713c3c70610b8a337a6b0ff Suggested-by: zhxihu Signed-off-by: Kees Cook Acked-by: Arnd Bergmann Signed-off-by: Russell King Signed-off-by: Frank Wang (cherry picked from commit 7f66cd3f5420e7d11abd234033e7cb7a9738fc38) --- diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 3f9a9ebc77c3..f0a75d9e1648 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -106,6 +106,15 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) endif +# -fstack-protector-strong triggers protection checks in this code, +# but it is being used too early to link to meaningful stack_chk logic. +nossp_flags := $(call cc-option, -fno-stack-protector) +CFLAGS_atags_to_fdt.o := $(nossp_flags) +CFLAGS_fdt.o := $(nossp_flags) +CFLAGS_fdt_ro.o := $(nossp_flags) +CFLAGS_fdt_rw.o := $(nossp_flags) +CFLAGS_fdt_wip.o := $(nossp_flags) + ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj) asflags-y := -DZIMAGE