On Wed, Mar 15, 2023 at 09:39:35AM +0100, Greg Kroah-Hartman wrote: > On Wed, Mar 01, 2023 at 07:06:59PM -0700, Tom Saeger wrote: > > From: "H.J. Lu" <hjl.tools@xxxxxxxxx> > > > > commit 84d5f77fc2ee4e010c2c037750e32f06e55224b0 upstream. > > > > In the x86 kernel, .exit.text and .exit.data sections are discarded at > > runtime, not by the linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS > > and define it in the x86 kernel linker script to keep them. > > > > The sections are added before the DISCARD directive so document here > > only the situation explicitly as this change doesn't have any effect on > > the generated kernel. Also, other architectures like ARM64 will use it > > too so generalize the approach with the RUNTIME_DISCARD_EXIT define. > > > > [ bp: Massage and extend commit message. ] > > > > Signed-off-by: H.J. Lu <hjl.tools@xxxxxxxxx> > > Signed-off-by: Borislav Petkov <bp@xxxxxxx> > > Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> > > Link: https://lkml.kernel.org/r/20200326193021.255002-1-hjl.tools@xxxxxxxxx > > Signed-off-by: Tom Saeger <tom.saeger@xxxxxxxxxx> > > The encoding of this email was very odd, with dos line-ends? Something > was odd on your side, all the others were fine. I've fixed it up... > > strange, > > greg k-h Thanks for pointing this out, and for fixing-up patch. My first thought was to blame `b4 prep`. Vegard helped me track this down: Rob already reported here: https://lore.kernel.org/all/CAL_JsqJHGUMsLUpH=s8Xa46NU9dbBuvPMCPJyRwQdvFr3WK9tw@xxxxxxxxxxxxxx/ Konstantin already fixed: https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=ebd05d6210e3421af2918dc178985789cc5fc390 Verified this locally. # b4 version == 0.12.0 ❯ file tmp-20230301_1858/* tmp-20230301_1858/0000-fix-build-id-on-arm64-if-config_modversions-y.eml: news or mail, ASCII text, with CRLF line terminators tmp-20230301_1858/0001-x86-vmlinux-lds-add-runtime_discard_exit-to-generic-discards.eml: unified diff output, ASCII text, with CRLF line terminators tmp-20230301_1858/0002-arch-fix-broken-buildid-for-arm64-and-riscv.eml: unified diff output, ASCII text tmp-20230301_1858/0003-powerpc-vmlinux-lds-define-runtime_discard_exit.eml: unified diff output, ASCII text tmp-20230301_1858/0004-powerpc-vmlinux-lds-don-t-discard-rela-for-relocatable-builds.eml: unified diff output, ASCII text tmp-20230301_1858/0005-s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2-36.eml: unified diff output, ASCII text tmp-20230301_1858/0006-sh-define-runtime_discard_exit.eml: unified diff output, ASCII text # b4 version >= 0.12.2 ❯ file tmp-20230315_0806/* tmp-20230315_0806/0000-fix-build-id-on-arm64-if-config_modversions-y.eml: news or mail, ASCII text tmp-20230315_0806/0001-x86-vmlinux-lds-add-runtime_discard_exit-to-generic-discards.eml: unified diff output, ASCII text tmp-20230315_0806/0002-arch-fix-broken-buildid-for-arm64-and-riscv.eml: unified diff output, ASCII text tmp-20230315_0806/0003-powerpc-vmlinux-lds-define-runtime_discard_exit.eml: unified diff output, ASCII text tmp-20230315_0806/0004-powerpc-vmlinux-lds-don-t-discard-rela-for-relocatable-builds.eml: unified diff output, ASCII text tmp-20230315_0806/0005-s390-define-runtime_discard_exit-to-fix-link-error-with-gnu-ld-2-36.eml: unified diff output, ASCII text tmp-20230315_0806/0006-sh-define-runtime_discard_exit.eml: unified diff output, ASCII text Regards, --Tom
