diff options
| author | Linus Torvalds | 2017-09-24 11:53:13 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-09-24 11:53:13 -0700 |
| commit | a4306434b79ffc859e5dc6ab0f305a3d8204ef46 (patch) | |
| tree | d498a3e807b2d5e2920465dbf9138606c43ba9b7 /arch/arm64 | |
| parent | a30282478271ea8e06d424f96c1537094b309c7c (diff) | |
| parent | a2048e34d4655c06d31400646ae495bbfeb16b27 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull address-limit checking fixes from Ingo Molnar:
"This fixes a number of bugs in the address-limit (USER_DS) checks that
got introduced in the merge window, (mostly) affecting the ARM and
ARM64 platforms"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
arm64/syscalls: Move address limit check in loop
arm/syscalls: Optimize address limit check
Revert "arm/syscalls: Check address limit on user-mode return"
syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index c45214f8fb54..0bdc96c61bc0 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -751,10 +751,10 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, */ trace_hardirqs_off(); - /* Check valid user FS if needed */ - addr_limit_user_check(); - do { + /* Check valid user FS if needed */ + addr_limit_user_check(); + if (thread_flags & _TIF_NEED_RESCHED) { schedule(); } else { |