Print this page
11787 Kernel needs to be built with retpolines
11788 Kernel needs to generally use RSB stuffing
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/sys/machprivregs.h
          +++ new/usr/src/uts/i86pc/sys/machprivregs.h
↓ open down ↓ 121 lines elided ↑ open up ↑
 122  122          movq    %rsi, REGOFF_RSI(%rsp); \
 123  123          movq    %rdi, REGOFF_RDI(%rsp); \
 124  124          swapgs
 125  125  
 126  126  #define FAST_INTR_POP                   \
 127  127          swapgs;                         \
 128  128          movq    REGOFF_RSI(%rsp), %rsi; \
 129  129          movq    REGOFF_RDI(%rsp), %rdi; \
 130  130          addq    $REGOFF_RIP, %rsp
 131  131  
 132      -#define FAST_INTR_RETURN        call *x86_md_clear; jmp tr_iret_user
      132 +#define FAST_INTR_RETURN        call x86_md_clear; jmp tr_iret_user
 133  133  
 134  134  #elif defined(__i386)
 135  135  
 136  136  #define FAST_INTR_PUSH          \
 137  137          cld;                    \
 138  138          __SEGREGS_PUSH          \
 139  139          __SEGREGS_LOAD_KERNEL
 140  140  
 141  141  #define FAST_INTR_POP           \
 142  142          __SEGREGS_POP
↓ open down ↓ 35 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX