diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 13:57:09 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 13:57:09 -0700 |
| commit | a7fb920b158da0a154da609a4c27ff693404ec90 (patch) | |
| tree | 0637688614d7889aef9dd76870b9605d3f563247 /kernel/entry | |
| parent | ce881fc06dc87e73928ced4c37b6ac6b32ef5fb6 (diff) | |
| parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
Merge tag 'v5.16-rc4' into docs-next
I have a couple of fixes for warnings introduced after -rc1; catch up to
-rc4 so that the fixes have something to fix.
Diffstat (limited to 'kernel/entry')
| -rw-r--r-- | kernel/entry/syscall_user_dispatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/entry/syscall_user_dispatch.c b/kernel/entry/syscall_user_dispatch.c index 4508201847d2..0b6379adff6b 100644 --- a/kernel/entry/syscall_user_dispatch.c +++ b/kernel/entry/syscall_user_dispatch.c @@ -48,7 +48,7 @@ bool syscall_user_dispatch(struct pt_regs *regs) * the selector is loaded by userspace. */ if (unlikely(__get_user(state, sd->selector))) { - force_fatal_sig(SIGSEGV); + force_exit_sig(SIGSEGV); return true; } @@ -56,7 +56,7 @@ bool syscall_user_dispatch(struct pt_regs *regs) return false; if (state != SYSCALL_DISPATCH_FILTER_BLOCK) { - force_fatal_sig(SIGSYS); + force_exit_sig(SIGSYS); return true; } } |