TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

signal: lift sigset size check out of do_sigpending()

Browse Source 
As sigsetsize argument of do_sigpending() is not used anywhere else in
that function after the check, remove this argument and move the check
out of do_sigpending() into rt_sigpending() and its compat analog.

Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Dmitry V. Levin
2017-08-22 02:16:43 +03:00
committed by Al Viro
parent 1681634b8c
commit 176826af03
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/signal.c
View File

@@ -2629,11 +2629,8 @@ COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset,
} }
#endif #endif
static int do_sigpending(void *set, unsigned long sigsetsize) static int do_sigpending(sigset_t *set)
{ {
if (sigsetsize > sizeof(sigset_t))
return -EINVAL;
spin_lock_irq(&current->sighand->siglock); spin_lock_irq(&current->sighand->siglock);
sigorsets(set, &current->pending.signal, sigorsets(set, &current->pending.signal,
&current->signal->shared_pending.signal); &current->signal->shared_pending.signal);
@@ -2653,7 +2650,12 @@ static int do_sigpending(void *set, unsigned long sigsetsize)
SYSCALL_DEFINE2(rt_sigpending, sigset_t __user *, uset, size_t, sigsetsize) SYSCALL_DEFINE2(rt_sigpending, sigset_t __user *, uset, size_t, sigsetsize)
{ {
sigset_t set; sigset_t set;
int err = do_sigpending(&set, sigsetsize); int err;
if (sigsetsize > sizeof(*uset))
return -EINVAL;
err = do_sigpending(&set);
if (!err && copy_to_user(uset, &set, sigsetsize)) if (!err && copy_to_user(uset, &set, sigsetsize))
err = -EFAULT; err = -EFAULT;
return err; return err;
@@ -2664,7 +2666,12 @@ COMPAT_SYSCALL_DEFINE2(rt_sigpending, compat_sigset_t __user *, uset,
compat_size_t, sigsetsize) compat_size_t, sigsetsize)
{ {
sigset_t set; sigset_t set;
int err = do_sigpending(&set, sigsetsize); int err;
if (sigsetsize > sizeof(*uset))
return -EINVAL;
err = do_sigpending(&set);
if (!err) if (!err)
err = put_compat_sigset(uset, &set, sigsetsize); err = put_compat_sigset(uset, &set, sigsetsize);
return err; return err;
@@ -3331,7 +3338,7 @@ SYSCALL_DEFINE1(sigpending, old_sigset_t __user *, set)
COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set32) COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set32)
{ {
sigset_t set; sigset_t set;
int err = do_sigpending(&set, sizeof(set.sig[0])); int err = do_sigpending(&set);
if (!err) if (!err)
err = put_user(set.sig[0], set32); err = put_user(set.sig[0], set32);
return err; return err;