diff options
| author | Linus Torvalds <[email protected]> | 2016-03-31 07:55:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-03-31 07:55:14 -0500 |
| commit | c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c (patch) | |
| tree | 462696ac1f6dda50a8f49d5d5ac2a93f8a16adec /arch/parisc/kernel/signal32.c | |
| parent | e9dcfaff0105045d6bbacb7620ee13f1976ecf07 (diff) | |
| parent | 910cd32e552ea09caa89cdbe328e468979b030dd (diff) | |
Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Fix seccomp filter support and SIGSYS signals on compat kernel.
Both patches are tagged for v4.5 stable kernel"
* 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix and enable seccomp filter support
parisc: Fix SIGSYS signals in compat case
Diffstat (limited to 'arch/parisc/kernel/signal32.c')
| -rw-r--r-- | arch/parisc/kernel/signal32.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index 984abbee71ca..c342b2e17492 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c @@ -371,6 +371,11 @@ copy_siginfo_to_user32 (compat_siginfo_t __user *to, const siginfo_t *from) val = (compat_int_t)from->si_int; err |= __put_user(val, &to->si_int); break; + case __SI_SYS >> 16: + err |= __put_user(ptr_to_compat(from->si_call_addr), &to->si_call_addr); + err |= __put_user(from->si_syscall, &to->si_syscall); + err |= __put_user(from->si_arch, &to->si_arch); + break; } } return err; |