Skip to content

Commit 941edc5

Browse files
committed
exit/syscall_user_dispatch: Send ordinary signals on failure
Use force_fatal_sig instead of calling do_exit directly. This ensures the ordinary signal handling path gets invoked, core dumps as appropriate get created, and for multi-threaded processes all of the threads are terminated not just a single thread. When asked Gabriel Krisman Bertazi <[email protected]> said [1]: > [email protected] (Eric W. Biederman) asked: > > > Why does do_syscal_user_dispatch call do_exit(SIGSEGV) and > > do_exit(SIGSYS) instead of force_sig(SIGSEGV) and force_sig(SIGSYS)? > > > > Looking at the code these cases are not expected to happen, so I would > > be surprised if userspace depends on any particular behaviour on the > > failure path so I think we can change this. > > Hi Eric, > > There is not really a good reason, and the use case that originated the > feature doesn't rely on it. > > Unless I'm missing yet another problem and others correct me, I think > it makes sense to change it as you described. > > > Is using do_exit in this way something you copied from seccomp? > > I'm not sure, its been a while, but I think it might be just that. The > first prototype of SUD was implemented as a seccomp mode. If at some point it becomes interesting we could relax "force_fatal_sig(SIGSEGV)" to instead say "force_sig_fault(SIGSEGV, SEGV_MAPERR, sd->selector)". I avoid doing that in this patch to avoid making it possible to catch currently uncatchable signals. Cc: Gabriel Krisman Bertazi <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Andy Lutomirski <[email protected]> [1] https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Eric W. Biederman <[email protected]>
1 parent 26d5bad commit 941edc5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

kernel/entry/syscall_user_dispatch.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,18 @@ bool syscall_user_dispatch(struct pt_regs *regs)
4747
* access_ok() is performed once, at prctl time, when
4848
* the selector is loaded by userspace.
4949
*/
50-
if (unlikely(__get_user(state, sd->selector)))
51-
do_exit(SIGSEGV);
50+
if (unlikely(__get_user(state, sd->selector))) {
51+
force_fatal_sig(SIGSEGV);
52+
return true;
53+
}
5254

5355
if (likely(state == SYSCALL_DISPATCH_FILTER_ALLOW))
5456
return false;
5557

56-
if (state != SYSCALL_DISPATCH_FILTER_BLOCK)
57-
do_exit(SIGSYS);
58+
if (state != SYSCALL_DISPATCH_FILTER_BLOCK) {
59+
force_fatal_sig(SIGSYS);
60+
return true;
61+
}
5862
}
5963

6064
sd->on_dispatch = true;

0 commit comments

Comments
 (0)