diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/tlbflush.h | 12 | ||||
| -rw-r--r-- | include/asm-x86_64/tlbflush.h | 12 | ||||
| -rw-r--r-- | include/linux/seccomp.h | 10 |
3 files changed, 24 insertions, 10 deletions
diff --git a/include/asm-i386/tlbflush.h b/include/asm-i386/tlbflush.h index f22fab0cea..ab216e1370 100644 --- a/include/asm-i386/tlbflush.h +++ b/include/asm-i386/tlbflush.h | |||
| @@ -22,16 +22,18 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define __flush_tlb_global() \ | 23 | #define __flush_tlb_global() \ |
| 24 | do { \ | 24 | do { \ |
| 25 | unsigned int tmpreg; \ | 25 | unsigned int tmpreg, cr4, cr4_orig; \ |
| 26 | \ | 26 | \ |
| 27 | __asm__ __volatile__( \ | 27 | __asm__ __volatile__( \ |
| 28 | "movl %1, %%cr4; # turn off PGE \n" \ | 28 | "movl %%cr4, %2; # turn off PGE \n" \ |
| 29 | "movl %2, %1; \n" \ | ||
| 30 | "andl %3, %1; \n" \ | ||
| 31 | "movl %1, %%cr4; \n" \ | ||
| 29 | "movl %%cr3, %0; \n" \ | 32 | "movl %%cr3, %0; \n" \ |
| 30 | "movl %0, %%cr3; # flush TLB \n" \ | 33 | "movl %0, %%cr3; # flush TLB \n" \ |
| 31 | "movl %2, %%cr4; # turn PGE back on \n" \ | 34 | "movl %2, %%cr4; # turn PGE back on \n" \ |
| 32 | : "=&r" (tmpreg) \ | 35 | : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) \ |
| 33 | : "r" (mmu_cr4_features & ~X86_CR4_PGE), \ | 36 | : "i" (~X86_CR4_PGE) \ |
| 34 | "r" (mmu_cr4_features) \ | ||
| 35 | : "memory"); \ | 37 | : "memory"); \ |
| 36 | } while (0) | 38 | } while (0) |
| 37 | 39 | ||
diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h index 2e811ac262..0617423825 100644 --- a/include/asm-x86_64/tlbflush.h +++ b/include/asm-x86_64/tlbflush.h | |||
| @@ -22,16 +22,18 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #define __flush_tlb_global() \ | 23 | #define __flush_tlb_global() \ |
| 24 | do { \ | 24 | do { \ |
| 25 | unsigned long tmpreg; \ | 25 | unsigned long tmpreg, cr4, cr4_orig; \ |
| 26 | \ | 26 | \ |
| 27 | __asm__ __volatile__( \ | 27 | __asm__ __volatile__( \ |
| 28 | "movq %1, %%cr4; # turn off PGE \n" \ | 28 | "movq %%cr4, %2; # turn off PGE \n" \ |
| 29 | "movq %2, %1; \n" \ | ||
| 30 | "andq %3, %1; \n" \ | ||
| 31 | "movq %1, %%cr4; \n" \ | ||
| 29 | "movq %%cr3, %0; # flush TLB \n" \ | 32 | "movq %%cr3, %0; # flush TLB \n" \ |
| 30 | "movq %0, %%cr3; \n" \ | 33 | "movq %0, %%cr3; \n" \ |
| 31 | "movq %2, %%cr4; # turn PGE back on \n" \ | 34 | "movq %2, %%cr4; # turn PGE back on \n" \ |
| 32 | : "=&r" (tmpreg) \ | 35 | : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) \ |
| 33 | : "r" (mmu_cr4_features & ~X86_CR4_PGE), \ | 36 | : "i" (~X86_CR4_PGE) \ |
| 34 | "r" (mmu_cr4_features) \ | ||
| 35 | : "memory"); \ | 37 | : "memory"); \ |
| 36 | } while (0) | 38 | } while (0) |
| 37 | 39 | ||
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 3a2702bbb1..dc89116bb1 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h | |||
| @@ -19,6 +19,11 @@ static inline void secure_computing(int this_syscall) | |||
| 19 | __secure_computing(this_syscall); | 19 | __secure_computing(this_syscall); |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | static inline int has_secure_computing(struct thread_info *ti) | ||
| 23 | { | ||
| 24 | return unlikely(test_ti_thread_flag(ti, TIF_SECCOMP)); | ||
| 25 | } | ||
| 26 | |||
| 22 | #else /* CONFIG_SECCOMP */ | 27 | #else /* CONFIG_SECCOMP */ |
| 23 | 28 | ||
| 24 | #if (__GNUC__ > 2) | 29 | #if (__GNUC__ > 2) |
| @@ -28,6 +33,11 @@ static inline void secure_computing(int this_syscall) | |||
| 28 | #endif | 33 | #endif |
| 29 | 34 | ||
| 30 | #define secure_computing(x) do { } while (0) | 35 | #define secure_computing(x) do { } while (0) |
| 36 | /* static inline to preserve typechecking */ | ||
| 37 | static inline int has_secure_computing(struct thread_info *ti) | ||
| 38 | { | ||
| 39 | return 0; | ||
| 40 | } | ||
| 31 | 41 | ||
| 32 | #endif /* CONFIG_SECCOMP */ | 42 | #endif /* CONFIG_SECCOMP */ |
| 33 | 43 | ||