Commit 2aa6615f authored Apr 27, 2022 by Nathan Chancellor Committed by Zheng Zengkai Apr 27, 2022

ARM: Do not use NOCROSSREFS directive with ld.lld

stable inclusion
from stable-v5.10.105
commit 8c4192d126ba2a231a0e242c1cbdfed6c7830723
category: bugfix
bugzilla: 186460 https://gitee.com/src-openeuler/kernel/issues/I53MHA
CVE: CVE-2022-23960

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

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

commit 36168e38 upstream.

ld.lld does not support the NOCROSSREFS directive at the moment, which
breaks the build after commit b9baf5c8 ("ARM: Spectre-BHB
workaround"):

  ld.lld: error: ./arch/arm/kernel/vmlinux.lds:34: AT expected, but got NOCROSSREFS

Support for this directive will eventually be implemented, at which
point a version check can be added. To avoid breaking the build in the
meantime, just define NOCROSSREFS to nothing when using ld.lld, with a
link to the issue for tracking.

Cc: stable@vger.kernel.org
Fixes: b9baf5c8 ("ARM: Spectre-BHB workaround")
Link: https://github.com/ClangBuiltLinux/linux/issues/1609


Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Chen Jiahao <chenjiahao16@huawei.com>
Reviewed-by: Liao Chang <liaochang1@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent afe18b25

arch/arm/include/asm/vmlinux.lds.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,14 @@
		#define ARM_MMU_DISCARD(x) x
		#endif

		/*
		* ld.lld does not support NOCROSSREFS:
		* https://github.com/ClangBuiltLinux/linux/issues/1609
		*/
		#ifdef CONFIG_LD_IS_LLD
		#define NOCROSSREFS
		#endif

		/* Set start/end symbol names to the LMA for the section */
		#define ARM_LMA(sym, section) \
		sym##_start = LOADADDR(section); \