Commit df65494f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull kernel hardening fix from Kees Cook:

 - Fix !SMP placement of '.data..decrypted' section (Nathan Chancellor)

* tag 'hardening-v6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  vmlinux.lds.h: Fix placement of '.data..decrypted' section
parents f9bbe0c9 000f8870

include/asm-generic/vmlinux.lds.h

+1 −1
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ 
#define DATA_DATA							\

	*(.xiptext)							\

	*(DATA_MAIN)							\

	*(.data..decrypted)						\

	*(.ref.data)							\

	*(.data..shared_aligned) /* percpu related */			\

	MEM_KEEP(init.data*)						\
@@ -995,7 +996,6 @@ 
#ifdef CONFIG_AMD_MEM_ENCRYPT

#define PERCPU_DECRYPTED_SECTION					\

	. = ALIGN(PAGE_SIZE);						\

	*(.data..decrypted)						\

	*(.data..percpu..decrypted)					\

	. = ALIGN(PAGE_SIZE);

#else