Commit ded653cc authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Arnd Bergmann

signal: Add set_user_sigmask()

Refactor reading sigset from userspace and updating sigmask
into an api.

This is useful for versions of syscalls that pass in the
sigmask and expect the current->sigmask to be changed during,
and restored after, the execution of the syscall.

With the advent of new y2038 syscalls in the subsequent patches,
we add two more new versions of the syscalls (for pselect, ppoll,
and io_pgetevents) in addition to the existing native and compat
versions. Adding such an api reduces the logic that would need to
be replicated otherwise.

Note that the calls to sigprocmask() ignored the return value
from the api as the function only returns an error on an invalid
first argument that is hardcoded at these call sites.
The updated logic uses set_current_blocked() instead.
Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 65102238
...@@ -2104,14 +2104,10 @@ SYSCALL_DEFINE6(io_pgetevents, ...@@ -2104,14 +2104,10 @@ SYSCALL_DEFINE6(io_pgetevents,
if (usig && copy_from_user(&ksig, usig, sizeof(ksig))) if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
return -EFAULT; return -EFAULT;
if (ksig.sigmask) {
if (ksig.sigsetsize != sizeof(sigset_t)) ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
return -EINVAL; if (ret)
if (copy_from_user(&ksigmask, ksig.sigmask, sizeof(ksigmask))) return ret;
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL); ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
if (signal_pending(current)) { if (signal_pending(current)) {
...@@ -2174,14 +2170,9 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents, ...@@ -2174,14 +2170,9 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
if (usig && copy_from_user(&ksig, usig, sizeof(ksig))) if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
return -EFAULT; return -EFAULT;
if (ksig.sigmask) { ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
if (ksig.sigsetsize != sizeof(compat_sigset_t)) if (ret)
return -EINVAL; return ret;
if (get_compat_sigset(&ksigmask, ksig.sigmask))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL); ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
if (signal_pending(current)) { if (signal_pending(current)) {
......
...@@ -2223,14 +2223,9 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events, ...@@ -2223,14 +2223,9 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events,
* If the caller wants a certain signal mask to be set during the wait, * If the caller wants a certain signal mask to be set during the wait,
* we apply it here. * we apply it here.
*/ */
if (sigmask) { error = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
if (sigsetsize != sizeof(sigset_t)) if (error)
return -EINVAL; return error;
if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
return -EFAULT;
sigsaved = current->blocked;
set_current_blocked(&ksigmask);
}
error = do_epoll_wait(epfd, events, maxevents, timeout); error = do_epoll_wait(epfd, events, maxevents, timeout);
...@@ -2266,14 +2261,9 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd, ...@@ -2266,14 +2261,9 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd,
* If the caller wants a certain signal mask to be set during the wait, * If the caller wants a certain signal mask to be set during the wait,
* we apply it here. * we apply it here.
*/ */
if (sigmask) { err = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
if (sigsetsize != sizeof(compat_sigset_t)) if (err)
return -EINVAL; return err;
if (get_compat_sigset(&ksigmask, sigmask))
return -EFAULT;
sigsaved = current->blocked;
set_current_blocked(&ksigmask);
}
err = do_epoll_wait(epfd, events, maxevents, timeout); err = do_epoll_wait(epfd, events, maxevents, timeout);
......
...@@ -717,16 +717,9 @@ static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp, ...@@ -717,16 +717,9 @@ static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
return -EINVAL; return -EINVAL;
} }
if (sigmask) { ret = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
/* XXX: Don't preclude handling different sized sigset_t's. */ if (ret)
if (sigsetsize != sizeof(sigset_t)) return ret;
return -EINVAL;
if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = core_sys_select(n, inp, outp, exp, to); ret = core_sys_select(n, inp, outp, exp, to);
ret = poll_select_copy_remaining(&end_time, tsp, 0, ret); ret = poll_select_copy_remaining(&end_time, tsp, 0, ret);
...@@ -1061,16 +1054,9 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds, ...@@ -1061,16 +1054,9 @@ SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, unsigned int, nfds,
return -EINVAL; return -EINVAL;
} }
if (sigmask) { ret = set_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
/* XXX: Don't preclude handling different sized sigset_t's. */ if (ret)
if (sigsetsize != sizeof(sigset_t)) return ret;
return -EINVAL;
if (copy_from_user(&ksigmask, sigmask, sizeof(ksigmask)))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = do_sys_poll(ufds, nfds, to); ret = do_sys_poll(ufds, nfds, to);
...@@ -1323,15 +1309,9 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp, ...@@ -1323,15 +1309,9 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
return -EINVAL; return -EINVAL;
} }
if (sigmask) { ret = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
if (sigsetsize != sizeof(compat_sigset_t)) if (ret)
return -EINVAL; return ret;
if (get_compat_sigset(&ksigmask, sigmask))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = compat_core_sys_select(n, inp, outp, exp, to); ret = compat_core_sys_select(n, inp, outp, exp, to);
ret = compat_poll_select_copy_remaining(&end_time, tsp, 0, ret); ret = compat_poll_select_copy_remaining(&end_time, tsp, 0, ret);
...@@ -1389,15 +1369,9 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, ...@@ -1389,15 +1369,9 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds,
return -EINVAL; return -EINVAL;
} }
if (sigmask) { ret = set_compat_user_sigmask(sigmask, &ksigmask, &sigsaved, sigsetsize);
if (sigsetsize != sizeof(compat_sigset_t)) if (ret)
return -EINVAL; return ret;
if (get_compat_sigset(&ksigmask, sigmask))
return -EFAULT;
sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));
sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
}
ret = do_sys_poll(ufds, nfds, to); ret = do_sys_poll(ufds, nfds, to);
......
...@@ -169,6 +169,10 @@ typedef struct { ...@@ -169,6 +169,10 @@ typedef struct {
compat_sigset_word sig[_COMPAT_NSIG_WORDS]; compat_sigset_word sig[_COMPAT_NSIG_WORDS];
} compat_sigset_t; } compat_sigset_t;
int set_compat_user_sigmask(const compat_sigset_t __user *usigmask,
sigset_t *set, sigset_t *oldset,
size_t sigsetsize);
struct compat_sigaction { struct compat_sigaction {
#ifndef __ARCH_HAS_IRIX_SIGACTION #ifndef __ARCH_HAS_IRIX_SIGACTION
compat_uptr_t sa_handler; compat_uptr_t sa_handler;
......
...@@ -273,6 +273,8 @@ extern int group_send_sig_info(int sig, struct kernel_siginfo *info, ...@@ -273,6 +273,8 @@ extern int group_send_sig_info(int sig, struct kernel_siginfo *info,
struct task_struct *p, enum pid_type type); struct task_struct *p, enum pid_type type);
extern int __group_send_sig_info(int, struct kernel_siginfo *, struct task_struct *); extern int __group_send_sig_info(int, struct kernel_siginfo *, struct task_struct *);
extern int sigprocmask(int, sigset_t *, sigset_t *); extern int sigprocmask(int, sigset_t *, sigset_t *);
extern int set_user_sigmask(const sigset_t __user *usigmask, sigset_t *set,
sigset_t *oldset, size_t sigsetsize);
extern void set_current_blocked(sigset_t *); extern void set_current_blocked(sigset_t *);
extern void __set_current_blocked(const sigset_t *); extern void __set_current_blocked(const sigset_t *);
extern int show_unhandled_signals; extern int show_unhandled_signals;
......
...@@ -2735,6 +2735,51 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset) ...@@ -2735,6 +2735,51 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
} }
EXPORT_SYMBOL(sigprocmask); EXPORT_SYMBOL(sigprocmask);
/*
* The api helps set app-provided sigmasks.
*
* This is useful for syscalls such as ppoll, pselect, io_pgetevents and
* epoll_pwait where a new sigmask is passed from userland for the syscalls.
*/
int set_user_sigmask(const sigset_t __user *usigmask, sigset_t *set,
sigset_t *oldset, size_t sigsetsize)
{
if (!usigmask)
return 0;
if (sigsetsize != sizeof(sigset_t))
return -EINVAL;
if (copy_from_user(set, usigmask, sizeof(sigset_t)))
return -EFAULT;
*oldset = current->blocked;
set_current_blocked(set);
return 0;
}
EXPORT_SYMBOL(set_user_sigmask);
#ifdef CONFIG_COMPAT
int set_compat_user_sigmask(const compat_sigset_t __user *usigmask,
sigset_t *set, sigset_t *oldset,
size_t sigsetsize)
{
if (!usigmask)
return 0;
if (sigsetsize != sizeof(compat_sigset_t))
return -EINVAL;
if (get_compat_sigset(set, usigmask))
return -EFAULT;
*oldset = current->blocked;
set_current_blocked(set);
return 0;
}
EXPORT_SYMBOL(set_compat_user_sigmask);
#endif
/** /**
* sys_rt_sigprocmask - change the list of currently blocked signals * sys_rt_sigprocmask - change the list of currently blocked signals
* @how: whether to add, remove, or set signals * @how: whether to add, remove, or set signals
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment