diff options
author | Linus Torvalds | 2021-11-19 11:33:31 -0800 |
---|---|---|
committer | Linus Torvalds | 2021-11-19 11:33:31 -0800 |
commit | 7af959b5d5c8497b423e802e2b0ad847cb29b3d3 (patch) | |
tree | ff59567a4f3d21650d48bf5712a1f84a94df69c5 /arch/x86/kernel | |
parent | ecd510d2ff86953378c540182f14c8890b1f1225 (diff) | |
parent | fcb116bc43c8c37c052530ead79872f8b2615711 (diff) |
Merge branch 'SA_IMMUTABLE-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull exit-vs-signal handling fixes from Eric Biederman:
"This is a small set of changes where debuggers were no longer able to
intercept synchronous SIGTRAP and SIGSEGV, introduced by the exit
cleanups.
This is essentially the change you suggested with all of i's dotted
and the t's crossed so that ptrace can intercept all of the cases it
has been able to intercept the past, and all of the cases that made it
to exit without giving ptrace a chance still don't give ptrace a
chance"
* 'SA_IMMUTABLE-fixes-for-v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
signal: Replace force_fatal_sig with force_exit_sig when in doubt
signal: Don't always set SA_IMMUTABLE for forced signals
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/vm86_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index cce1c89cb7df..c21bcd668284 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -160,7 +160,7 @@ Efault_end: user_access_end(); Efault: pr_alert("could not access userspace vm86 info\n"); - force_fatal_sig(SIGSEGV); + force_exit_sig(SIGSEGV); goto exit_vm86; } |