diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2017-07-31 17:15:31 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2018-01-15 17:55:59 -0600 |
commit | 212a36a17efe4d696d1e3c31ebd79a9fb0cbb14b (patch) | |
tree | 943b3454aad156b37e2396ac314e6afc2d43c84c /arch/x86/kernel/signal_compat.c | |
parent | 56b81456f4ee048699f72edc02b369a33d1b94e6 (diff) | |
download | linux-stable-212a36a17efe4d696d1e3c31ebd79a9fb0cbb14b.tar.gz linux-stable-212a36a17efe4d696d1e3c31ebd79a9fb0cbb14b.tar.bz2 linux-stable-212a36a17efe4d696d1e3c31ebd79a9fb0cbb14b.zip |
signal: Unify and correct copy_siginfo_from_user32
The function copy_siginfo_from_user32 is used for two things, in ptrace
since the dawn of siginfo for arbirarily modifying a signal that
user space sees, and in sigqueueinfo to send a signal with arbirary
siginfo data.
Create a single copy of copy_siginfo_from_user32 that all architectures
share, and teach it to handle all of the cases in the siginfo union.
In the generic version of copy_siginfo_from_user32 ensure that all
of the fields in siginfo are initialized so that the siginfo structure
can be safely copied to userspace if necessary.
When copying the embedded sigval union copy the si_int member. That
ensures the 32bit values passes through the kernel unchanged.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'arch/x86/kernel/signal_compat.c')
-rw-r--r-- | arch/x86/kernel/signal_compat.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index feb3ac135d0c..59148de2d83f 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -207,24 +207,3 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) return __copy_siginfo_to_user32(to, from, in_x32_syscall()); } -int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) -{ - int err = 0; - u32 ptr32; - - if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t))) - return -EFAULT; - - get_user_try { - get_user_ex(to->si_signo, &from->si_signo); - get_user_ex(to->si_errno, &from->si_errno); - get_user_ex(to->si_code, &from->si_code); - - get_user_ex(to->si_pid, &from->si_pid); - get_user_ex(to->si_uid, &from->si_uid); - get_user_ex(ptr32, &from->si_ptr); - to->si_ptr = compat_ptr(ptr32); - } get_user_catch(err); - - return err; -} |