diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
| commit | 6c76650b6e643ed2665c72305c47f08f0babd07a (patch) | |
| tree | 0e9dc0ac01586e3a0342a9e09eec0f969f1efb54 /arch/x86/kernel/signal_compat.c | |
| parent | 6b382d660242a32d063d0a7e5200c3e5e702c243 (diff) | |
| parent | 71c4271c9a58a75e2b6f0ffa81292befdfb02e93 (diff) | |
| download | linux-next-6c76650b6e643ed2665c72305c47f08f0babd07a.tar.gz | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/kernel/signal_compat.c')
| -rw-r--r-- | arch/x86/kernel/signal_compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index ec1f756f9dc9..71beb28600d4 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -151,8 +151,8 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from, if (from->si_signo == SIGSEGV) { if (from->si_code == SEGV_BNDERR) { - compat_uptr_t lower = (unsigned long)&to->si_lower; - compat_uptr_t upper = (unsigned long)&to->si_upper; + compat_uptr_t lower = (unsigned long)from->si_lower; + compat_uptr_t upper = (unsigned long)from->si_upper; put_user_ex(lower, &to->si_lower); put_user_ex(upper, &to->si_upper); } |