Commit 6d8b1065 authored by Michal Kubecek's avatar Michal Kubecek Committed by sanglipeng1
Browse files

kbuild: dummy-tools: adjust to stricter stackprotector check 

stable inclusion
from stable-v5.10.215
commit 44900a8bec03aed77f23b374acb9103dcd3e7a3d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJJ2D

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=44900a8bec03aed77f23b374acb9103dcd3e7a3d



--------------------------------

commit c93db682 upstream.

Commit 3fb0fdb3 ("x86/stackprotector/32: Make the canary into a regular
percpu variable") modified the stackprotector check on 32-bit x86 to check
if gcc supports using %fs as canary. Adjust dummy-tools gcc script to pass
this new test by returning "%fs" rather than "%gs" if it detects
-mstack-protector-guard-reg=fs on command line.

Fixes: 3fb0fdb3 ("x86/stackprotector/32: Make the canary into a regular percpu variable")
Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 3014fcc3

scripts/dummy-tools/gcc

+5 −1
Original line number Diff line number Diff line
@@ -76,7 +76,11 @@ fi 
if arg_contain -S "$@"; then

	# For scripts/gcc-x86-*-has-stack-protector.sh

	if arg_contain -fstack-protector "$@"; then

		if arg_contain -mstack-protector-guard-reg=fs "$@"; then

			echo "%fs"

		else

			echo "%gs"

		fi

		exit 0

	fi

fi