diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-06 03:46:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-06 03:46:08 -0700 |
| commit | 3b8fc0b7a3fcc809378d82dbf66b417e186af205 (patch) | |
| tree | 6e44c44ec85ddba4faf8cb108b04c47cb3fc4414 /arch/x86/entry/common.c | |
| parent | 8f037f0b363b3907444a3a46b90e293284c6da51 (diff) | |
| parent | d9a879450e01a53b297876072dfc1e541181862b (diff) | |
Merge "Merge android-4.4.158 (f9e4134) into msm-4.4"
Diffstat (limited to 'arch/x86/entry/common.c')
| -rw-r--r-- | arch/x86/entry/common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 071582a3b5c0..a9e501303e15 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -22,6 +22,7 @@ #include <linux/user-return-notifier.h> #include <linux/nospec.h> #include <linux/uprobes.h> +#include <linux/syscalls.h> #include <asm/desc.h> #include <asm/traps.h> @@ -273,6 +274,8 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs) struct thread_info *ti = pt_regs_to_thread_info(regs); u32 cached_flags; + addr_limit_user_check(); + if (IS_ENABLED(CONFIG_PROVE_LOCKING) && WARN_ON(!irqs_disabled())) local_irq_disable(); |