Skip to content

Commit ffcf9c5

Browse files
nickdesaulnierstorvalds
authored andcommitted
x86: link vdso and boot with -z noexecstack --no-warn-rwx-segments
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: llvm/llvm-project#57009 Reported-and-tested-by: Jens Axboe <axboe@kernel.dk> Suggested-by: Fangrui Song <maskray@google.com> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 0d362be commit ffcf9c5

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

arch/x86/boot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ $(obj)/zoffset.h: $(obj)/compressed/vmlinux FORCE
103103
AFLAGS_header.o += -I$(objtree)/$(obj)
104104
$(obj)/header.o: $(obj)/zoffset.h
105105

106-
LDFLAGS_setup.elf := -m elf_i386 -T
106+
LDFLAGS_setup.elf := -m elf_i386 -z noexecstack -T
107107
$(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE
108108
$(call if_changed,ld)
109109

arch/x86/boot/compressed/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ LDFLAGS_vmlinux := -pie $(call ld-option, --no-dynamic-linker)
6969
ifdef CONFIG_LD_ORPHAN_WARN
7070
LDFLAGS_vmlinux += --orphan-handling=warn
7171
endif
72+
LDFLAGS_vmlinux += -z noexecstack
73+
ifeq ($(CONFIG_LD_IS_BFD),y)
74+
LDFLAGS_vmlinux += $(call ld-option,--no-warn-rwx-segments)
75+
endif
7276
LDFLAGS_vmlinux += -T
7377

7478
hostprogs := mkpiggy

arch/x86/entry/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ quiet_cmd_vdso = VDSO $@
180180
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
181181

182182
VDSO_LDFLAGS = -shared --hash-style=both --build-id=sha1 \
183-
$(call ld-option, --eh-frame-hdr) -Bsymbolic
183+
$(call ld-option, --eh-frame-hdr) -Bsymbolic -z noexecstack
184184
GCOV_PROFILE := n
185185

186186
quiet_cmd_vdso_and_check = VDSO $@

0 commit comments

Comments
 (0)