Skip to content
  • Linus Torvalds's avatar
    Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 88dc7fca
    Linus Torvalds authored
    Pull x86 pti bits and fixes from Thomas Gleixner:
     "This last update contains:
    
       - An objtool fix to prevent a segfault with the gold linker by
         changing the invocation order. That's not just for gold, it's a
         general robustness improvement.
    
       - An improved error message for objtool which spares tearing hairs.
    
       - Make KASAN fail loudly if there is not enough memory instead of
         oopsing at some random place later
    
       - RSB fill on context switch to prevent RSB underflow and speculation
         through other units.
    
       - Make the retpoline/RSB functionality work reliably for both Intel
         and AMD
    
       - Add retpoline to the module version magic so mismatch can be
         detected
    
       - A small (non-fix) update for cpufeatures which prevents cpu feature
         clashing for the upcoming extra mitigation bits to ease
         backporting"
    
    * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      module: Add retpoline tag to VERMAGIC
      x86/cpufeature: Move processor tracing out of scattered features
      objtool: Improve error message for bad file argument
      objtool: Fix seg fault with gold linker
      x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
      x86/retpoline: Fill RSB on context switch for affected CPUs
      x86/kasan: Panic if there is not enough memory to boot
    88dc7fca