diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
| commit | 4d012040161cba054208555300d9fdf2b8925c34 (patch) | |
| tree | 326f597177a377bc17b98e5e77d242a0ba4b042c /kernel/entry/syscall_user_dispatch.c | |
| parent | c4bc515d73b5201d30f78b935accdd9e3988f05e (diff) | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
Merge 5.16-rc3 into usb-next
We need the USB driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/entry/syscall_user_dispatch.c')
| -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; } } |