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

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

diff --combined include/asm-generic/vmlinux.lds.h
index d06ada2,f40a0e0..3dc5824
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -162,16 -162,6 +162,16 @@@
  #define PATCHABLE_DISCARDS    *(__patchable_function_entries)
  #endif
  
 +#ifndef CONFIG_ARCH_SUPPORTS_CFI_CLANG
 +/*
 + * Simply points to ftrace_stub, but with the proper protocol.
 + * Defined by the linker script in linux/vmlinux.lds.h
 + */
 +#define       FTRACE_STUB_HACK        ftrace_stub_graph = ftrace_stub;
 +#else
 +#define FTRACE_STUB_HACK
 +#endif
 +
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  /*
   * The ftrace call sites are logged to a section whose name depends on the
@@@ -179,6 -169,10 +179,6 @@@
   * FTRACE_CALLSITE_SECTION. We capture all of them here to avoid header
   * dependencies for FTRACE_CALLSITE_SECTION's definition.
   *
 - * Need to also make ftrace_stub_graph point to ftrace_stub
 - * so that the same stub location may have different protocols
 - * and not mess up with C verifiers.
 - *
   * ftrace_ops_list_func will be defined as arch_ftrace_ops_list_func
   * as some archs will have a different prototype for that function
   * but ftrace_ops_list_func() will have a single prototype.
@@@ -188,11 -182,11 +188,11 @@@
                        KEEP(*(__mcount_loc))                   \
                        KEEP_PATCHABLE                          \
                        __stop_mcount_loc = .;                  \
 -                      ftrace_stub_graph = ftrace_stub;        \
 +                      FTRACE_STUB_HACK                        \
                        ftrace_ops_list_func = arch_ftrace_ops_list_func;
  #else
  # ifdef CONFIG_FUNCTION_TRACER
 -#  define MCOUNT_REC()        ftrace_stub_graph = ftrace_stub;        \
 +#  define MCOUNT_REC()        FTRACE_STUB_HACK                        \
                        ftrace_ops_list_func = arch_ftrace_ops_list_func;
  # else
  #  define MCOUNT_REC()
@@@ -347,6 -341,7 +347,7 @@@
  #define DATA_DATA                                                     \
        *(.xiptext)                                                     \
        *(DATA_MAIN)                                                    \
+       *(.data..decrypted)                                             \
        *(.ref.data)                                                    \
        *(.data..shared_aligned) /* percpu related */                   \
        MEM_KEEP(init.data*)                                            \
@@@ -995,7 -990,6 +996,6 @@@
  #ifdef CONFIG_AMD_MEM_ENCRYPT
  #define PERCPU_DECRYPTED_SECTION                                      \
        . = ALIGN(PAGE_SIZE);                                           \
-       *(.data..decrypted)                                             \
        *(.data..percpu..decrypted)                                     \
        . = ALIGN(PAGE_SIZE);
  #else