From: Greg Kroah-Hartman Date: Wed, 24 Aug 2022 07:23:29 +0000 (+0200) Subject: drop some 4.9 makefile/linker changes X-Git-Tag: v4.9.326~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c44e3d7d241e873488bebd0753becd423499223;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 4.9 makefile/linker changes --- diff --git a/queue-4.9/kbuild-clear-ldflags-in-the-top-makefile.patch b/queue-4.9/kbuild-clear-ldflags-in-the-top-makefile.patch deleted file mode 100644 index b23f1d77821..00000000000 --- a/queue-4.9/kbuild-clear-ldflags-in-the-top-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ce99d0bf312daf0178e640da9e3c93b773a67e7d Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Fri, 16 Mar 2018 16:37:09 +0900 -Subject: kbuild: clear LDFLAGS in the top Makefile - -From: Masahiro Yamada - -commit ce99d0bf312daf0178e640da9e3c93b773a67e7d upstream. - -Currently LDFLAGS is not cleared, so same flags are accumulated in -LDFLAGS when the top Makefile is recursively invoked. - -I found unneeded rebuild for ARCH=arm64 when CONFIG_TRIM_UNUSED_KSYMS -is enabled. If include/generated/autoksyms.h is updated, the top -Makefile is recursively invoked, then arch/arm64/Makefile adds one -more '-maarch64linux'. Due to the command line change, modules are -rebuilt needlessly. - -Signed-off-by: Masahiro Yamada -Acked-by: Nicolas Pitre -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - ---- a/Makefile -+++ b/Makefile -@@ -395,6 +395,7 @@ KBUILD_CFLAGS_KERNEL := - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+LDFLAGS := - GCC_PLUGINS_CFLAGS := - CLANG_FLAGS := - diff --git a/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch b/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch deleted file mode 100644 index a95109c3d5d..00000000000 --- a/queue-4.9/makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0d362be5b14200b77ecc2127936a5ff82fbffe41 Mon Sep 17 00:00:00 2001 -From: Nick Desaulniers -Date: Wed, 10 Aug 2022 15:24:40 -0700 -Subject: Makefile: link with -z noexecstack --no-warn-rwx-segments - -From: Nick Desaulniers - -commit 0d362be5b14200b77ecc2127936a5ff82fbffe41 upstream. - -Users of GNU ld (BFD) from binutils 2.39+ will observe multiple -instances of a new warning when linking kernels in the form: - - ld: warning: vmlinux: missing .note.GNU-stack section implies executable stack - ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker - ld: warning: vmlinux has a LOAD segment with RWX permissions - -Generally, we would like to avoid the stack being executable. Because -there could be a need for the stack to be executable, assembler sources -have to opt-in to this security feature via explicit creation of the -.note.GNU-stack feature (which compilers create by default) or command -line flag --noexecstack. Or we can simply tell the linker the -production of such sections is irrelevant and to link the stack as ---noexecstack. - -LLVM's LLD linker defaults to -z noexecstack, so this flag isn't -strictly necessary when linking with LLD, only BFD, but it doesn't hurt -to be explicit here for all linkers IMO. --no-warn-rwx-segments is -currently BFD specific and only available in the current latest release, -so it's wrapped in an ld-option check. - -While the kernel makes extensive usage of ELF sections, it doesn't use -permissions from ELF segments. - -Link: https://lore.kernel.org/linux-block/3af4127a-f453-4cf7-f133-a181cce06f73@kernel.dk/ -Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 -Link: https://github.com/llvm/llvm-project/issues/57009 -Reported-and-tested-by: Jens Axboe -Suggested-by: Fangrui Song -Signed-off-by: Nick Desaulniers -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -870,6 +870,9 @@ ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATI - LDFLAGS_vmlinux += $(call ld-option, --gc-sections,) - endif - -+LDFLAGS += -z noexecstack -+LDFLAGS += $(call ld-option,--no-warn-rwx-segments) -+ - ifeq ($(CONFIG_STRIP_ASM_SYMS),y) - LDFLAGS_vmlinux += $(call ld-option, -X,) - endif diff --git a/queue-4.9/series b/queue-4.9/series index 1ab3b96c1a7..b6f179607cc 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -22,8 +22,6 @@ acpi-video-force-backlight-native-for-some-tongfang-devices.patch acpi-video-shortening-quirk-list-by-identifying-clevo-by-board_name-only.patch random-only-call-boot_init_stack_canary-once.patch macintosh-adb-fix-oob-read-in-do_adb_query-function.patch -makefile-link-with-z-noexecstack-no-warn-rwx-segments.patch -x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch alsa-bcd2000-fix-a-uaf-bug-on-the-error-path-of-probing.patch add-barriers-to-buffer_uptodate-and-set_buffer_uptodate.patch kvm-svm-don-t-bug-if-userspace-injects-an-interrupt-with-gif-0.patch @@ -83,7 +81,6 @@ nios2-restarts-apply-only-to-the-first-sigframe-we-build.patch nios2-add-force_successful_syscall_return.patch netfilter-nf_tables-really-skip-inactive-sets-when-allocating-name.patch fec-fix-timer-capture-timing-in-fec_ptp_enable_pps.patch -kbuild-clear-ldflags-in-the-top-makefile.patch irqchip-tegra-fix-overflow-implicit-truncation-warni.patch usb-host-ohci-ppc-of-fix-refcount-leak-bug.patch gadgetfs-ep_io-wait-until-irq-finishes.patch diff --git a/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch b/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch deleted file mode 100644 index 811a66b049a..00000000000 --- a/queue-4.9/x86-link-vdso-and-boot-with-z-noexecstack-no-warn-rwx-segments.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ffcf9c5700e49c0aee42dcba9a12ba21338e8136 Mon Sep 17 00:00:00 2001 -From: Nick Desaulniers -Date: Wed, 10 Aug 2022 15:24:41 -0700 -Subject: x86: link vdso and boot with -z noexecstack --no-warn-rwx-segments - -From: Nick Desaulniers - -commit ffcf9c5700e49c0aee42dcba9a12ba21338e8136 upstream. - -Users of GNU ld (BFD) from binutils 2.39+ will observe multiple -instances of a new warning when linking kernels in the form: - - ld: warning: arch/x86/boot/pmjump.o: missing .note.GNU-stack section implies executable stack - ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker - ld: warning: arch/x86/boot/compressed/vmlinux has a LOAD segment with RWX permissions - -Generally, we would like to avoid the stack being executable. Because -there could be a need for the stack to be executable, assembler sources -have to opt-in to this security feature via explicit creation of the -.note.GNU-stack feature (which compilers create by default) or command -line flag --noexecstack. Or we can simply tell the linker the -production of such sections is irrelevant and to link the stack as ---noexecstack. - -LLVM's LLD linker defaults to -z noexecstack, so this flag isn't -strictly necessary when linking with LLD, only BFD, but it doesn't hurt -to be explicit here for all linkers IMO. --no-warn-rwx-segments is -currently BFD specific and only available in the current latest release, -so it's wrapped in an ld-option check. - -While the kernel makes extensive usage of ELF sections, it doesn't use -permissions from ELF segments. - -Link: https://lore.kernel.org/linux-block/3af4127a-f453-4cf7-f133-a181cce06f73@kernel.dk/ -Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 -Link: https://github.com/llvm/llvm-project/issues/57009 -Reported-and-tested-by: Jens Axboe -Suggested-by: Fangrui Song -Signed-off-by: Nick Desaulniers -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/boot/Makefile | 2 +- - arch/x86/boot/compressed/Makefile | 4 ++++ - arch/x86/entry/vdso/Makefile | 2 +- - 3 files changed, 6 insertions(+), 2 deletions(-) - ---- a/arch/x86/boot/Makefile -+++ b/arch/x86/boot/Makefile -@@ -100,7 +100,7 @@ $(obj)/zoffset.h: $(obj)/compressed/vmli - AFLAGS_header.o += -I$(objtree)/$(obj) - $(obj)/header.o: $(obj)/zoffset.h - --LDFLAGS_setup.elf := -m elf_i386 -T -+LDFLAGS_setup.elf := -m elf_i386 -z noexecstack -T - $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE - $(call if_changed,ld) - ---- a/arch/x86/boot/compressed/Makefile -+++ b/arch/x86/boot/compressed/Makefile -@@ -54,6 +54,10 @@ else - LDFLAGS += $(shell $(LD) --help 2>&1 | grep -q "\-z noreloc-overflow" \ - && echo "-z noreloc-overflow -pie --no-dynamic-linker") - endif -+ -+LDFLAGS += -z noexecstack -+LDFLAGS += $(call ld-option,--no-warn-rwx-segments) -+ - LDFLAGS_vmlinux := -T - - hostprogs-y := mkpiggy ---- a/arch/x86/entry/vdso/Makefile -+++ b/arch/x86/entry/vdso/Makefile -@@ -168,7 +168,7 @@ quiet_cmd_vdso = VDSO $@ - - VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ - $(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \ -- -Bsymbolic -+ -Bsymbolic -z noexecstack - GCOV_PROFILE := n - - #