Commit df65494f authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -347,6 +347,7 @@ ...@@ -347,6 +347,7 @@
#define DATA_DATA \ #define DATA_DATA \
*(.xiptext) \ *(.xiptext) \
*(DATA_MAIN) \ *(DATA_MAIN) \
*(.data..decrypted) \
*(.ref.data) \ *(.ref.data) \
*(.data..shared_aligned) /* percpu related */ \ *(.data..shared_aligned) /* percpu related */ \
MEM_KEEP(init.data*) \ MEM_KEEP(init.data*) \
...@@ -995,7 +996,6 @@ ...@@ -995,7 +996,6 @@
#ifdef CONFIG_AMD_MEM_ENCRYPT #ifdef CONFIG_AMD_MEM_ENCRYPT
#define PERCPU_DECRYPTED_SECTION \ #define PERCPU_DECRYPTED_SECTION \
. = ALIGN(PAGE_SIZE); \ . = ALIGN(PAGE_SIZE); \
*(.data..decrypted) \
*(.data..percpu..decrypted) \ *(.data..percpu..decrypted) \
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment