tile: switch to generic compat rt_sigaction()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
7b5d3c1d11
Коммит
a402922bff
|
@ -22,6 +22,7 @@ config TILE
|
|||
select GENERIC_CLOCKEVENTS
|
||||
select MODULES_USE_ELF_RELA
|
||||
select GENERIC_SIGALTSTACK
|
||||
select GENERIC_COMPAT_RT_SIGACTION
|
||||
select GENERIC_COMPAT_RT_SIGQUEUEINFO
|
||||
select GENERIC_COMPAT_RT_SIGPROCMASK
|
||||
select GENERIC_COMPAT_RT_SIGPENDING
|
||||
|
|
|
@ -272,12 +272,8 @@ extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka,
|
|||
struct pt_regs *regs);
|
||||
|
||||
/* Compat syscalls. */
|
||||
struct compat_sigaction;
|
||||
struct compat_siginfo;
|
||||
struct compat_sigaltstack;
|
||||
long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,
|
||||
struct compat_sigaction __user *oact,
|
||||
size_t sigsetsize);
|
||||
long compat_sys_rt_sigreturn(void);
|
||||
long compat_sys_truncate64(char __user *filename, u32 dummy, u32 low, u32 high);
|
||||
long compat_sys_ftruncate64(unsigned int fd, u32 dummy, u32 low, u32 high);
|
||||
|
|
|
@ -34,13 +34,6 @@
|
|||
#include <asm/syscalls.h>
|
||||
#include <arch/interrupts.h>
|
||||
|
||||
struct compat_sigaction {
|
||||
compat_uptr_t sa_handler;
|
||||
compat_ulong_t sa_flags;
|
||||
compat_uptr_t sa_restorer;
|
||||
sigset_t sa_mask __packed;
|
||||
};
|
||||
|
||||
struct compat_ucontext {
|
||||
compat_ulong_t uc_flags;
|
||||
compat_uptr_t uc_link;
|
||||
|
@ -55,48 +48,6 @@ struct compat_rt_sigframe {
|
|||
struct compat_ucontext uc;
|
||||
};
|
||||
|
||||
long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,
|
||||
struct compat_sigaction __user *oact,
|
||||
size_t sigsetsize)
|
||||
{
|
||||
struct k_sigaction new_sa, old_sa;
|
||||
int ret = -EINVAL;
|
||||
|
||||
/* XXX: Don't preclude handling different sized sigset_t's. */
|
||||
if (sigsetsize != sizeof(sigset_t))
|
||||
goto out;
|
||||
|
||||
if (act) {
|
||||
compat_uptr_t handler, restorer;
|
||||
|
||||
if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
|
||||
__get_user(handler, &act->sa_handler) ||
|
||||
__get_user(new_sa.sa.sa_flags, &act->sa_flags) ||
|
||||
__get_user(restorer, &act->sa_restorer) ||
|
||||
__copy_from_user(&new_sa.sa.sa_mask, &act->sa_mask,
|
||||
sizeof(sigset_t)))
|
||||
return -EFAULT;
|
||||
new_sa.sa.sa_handler = compat_ptr(handler);
|
||||
new_sa.sa.sa_restorer = compat_ptr(restorer);
|
||||
}
|
||||
|
||||
ret = do_sigaction(sig, act ? &new_sa : NULL, oact ? &old_sa : NULL);
|
||||
|
||||
if (!ret && oact) {
|
||||
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
|
||||
__put_user(ptr_to_compat(old_sa.sa.sa_handler),
|
||||
&oact->sa_handler) ||
|
||||
__put_user(ptr_to_compat(old_sa.sa.sa_restorer),
|
||||
&oact->sa_restorer) ||
|
||||
__put_user(old_sa.sa.sa_flags, &oact->sa_flags) ||
|
||||
__copy_to_user(&oact->sa_mask, &old_sa.sa.sa_mask,
|
||||
sizeof(sigset_t)))
|
||||
return -EFAULT;
|
||||
}
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from)
|
||||
{
|
||||
int err;
|
||||
|
|
Загрузка…
Ссылка в новой задаче