diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-05 12:28:28 +0200 |
| commit | 8de79d357345d62acebf3b75d331c78f17031929 (patch) | |
| tree | 74f4e0f6bc5b42bb24b19edc5afa57a5b41fea93 /arch/x86/kernel | |
| parent | 4bd5587e77896b6965adcfdf650e53a039274aa4 (diff) | |
| parent | cfac6dfa42bddfa9711b20d486e521d1a41ab09f (diff) | |
| download | linux-next-8de79d357345d62acebf3b75d331c78f17031929.tar.gz | |
Merge branch 'x86/urgent'
Diffstat (limited to 'arch/x86/kernel')
| -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); } |