• Linus Torvalds's avatar
    Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 55151142
    Linus Torvalds authored
    Pull x86 pti fixes from Thomas Gleixner:
     "A small set of fixes for the meltdown/spectre mitigations:
    
       - Make kprobes aware of retpolines to prevent probes in the retpoline
         thunks.
    
       - Make the machine check exception speculation protected. MCE used to
         issue an indirect call directly from the ASM entry code. Convert
         that to a direct call into a C-function and issue the indirect call
         from there so the compiler can add the retpoline protection,
    
       - Make the vmexit_fill_RSB() assembly less stupid
    
       - Fix a typo in the PTI documentation"
    
    * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/retpoline: Optimize inline assembler for vmexit_fill_RSB
      x86/pti: Document fix wrong index
      kprobes/x86: Disable optimizing on the function jumps to indirect thunk
      kprobes/x86: Blacklist indirect thunk functions for kprobes
      retpoline: Introduce start/end markers of indirect thunk
      x86/mce: Make machine check speculation protected
    55151142
opt.c 13.3 KB