diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
| commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
| tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /include/linux/syscalls.h | |
| parent | 1e4078f0bba46ad61b69548abe6a6faf63b89380 (diff) | |
| parent | 3dd40cb320fee7c23b574ab821ce140ccd1281c9 (diff) | |
| download | cachepc-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.gz cachepc-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip | |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 95606a2d556f..a78186d826d7 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -221,21 +221,25 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event) } \ static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)) -#ifdef TIF_FSCHECK /* * Called before coming back to user-mode. Returning to user-mode with an * address limit different than USER_DS can allow to overwrite kernel memory. */ static inline void addr_limit_user_check(void) { - +#ifdef TIF_FSCHECK if (!test_thread_flag(TIF_FSCHECK)) return; +#endif - BUG_ON(!segment_eq(get_fs(), USER_DS)); + if (CHECK_DATA_CORRUPTION(!segment_eq(get_fs(), USER_DS), + "Invalid address limit on user-mode return")) + force_sig(SIGKILL, current); + +#ifdef TIF_FSCHECK clear_thread_flag(TIF_FSCHECK); -} #endif +} asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special, qid_t id, void __user *addr); |