Commit c9da9f2129d6a421c32e334a83770a9e67f7feac
1 parent
1134723e96
Exists in
master
and in
4 other branches
[CVE-2009-0029] Make sys_pselect7 static
Not a single architecture has wired up sys_pselect7 plus it is the only system call with seven parameters. Just make it static and rename it to do_pselect which will do the work for sys_pselect6. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Showing 2 changed files with 7 additions and 7 deletions Side-by-side Diff
fs/compat.c
| ... | ... | @@ -1709,7 +1709,7 @@ |
| 1709 | 1709 | } |
| 1710 | 1710 | |
| 1711 | 1711 | #ifdef HAVE_SET_RESTORE_SIGMASK |
| 1712 | -asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp, | |
| 1712 | +static long do_compat_pselect(int n, compat_ulong_t __user *inp, | |
| 1713 | 1713 | compat_ulong_t __user *outp, compat_ulong_t __user *exp, |
| 1714 | 1714 | struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask, |
| 1715 | 1715 | compat_size_t sigsetsize) |
| ... | ... | @@ -1775,8 +1775,8 @@ |
| 1775 | 1775 | (compat_size_t __user *)(sig+sizeof(up)))) |
| 1776 | 1776 | return -EFAULT; |
| 1777 | 1777 | } |
| 1778 | - return compat_sys_pselect7(n, inp, outp, exp, tsp, compat_ptr(up), | |
| 1779 | - sigsetsize); | |
| 1778 | + return do_compat_pselect(n, inp, outp, exp, tsp, compat_ptr(up), | |
| 1779 | + sigsetsize); | |
| 1780 | 1780 | } |
| 1781 | 1781 | |
| 1782 | 1782 | asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds, |
fs/select.c
| ... | ... | @@ -582,9 +582,9 @@ |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | 584 | #ifdef HAVE_SET_RESTORE_SIGMASK |
| 585 | -asmlinkage long sys_pselect7(int n, fd_set __user *inp, fd_set __user *outp, | |
| 586 | - fd_set __user *exp, struct timespec __user *tsp, | |
| 587 | - const sigset_t __user *sigmask, size_t sigsetsize) | |
| 585 | +static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp, | |
| 586 | + fd_set __user *exp, struct timespec __user *tsp, | |
| 587 | + const sigset_t __user *sigmask, size_t sigsetsize) | |
| 588 | 588 | { |
| 589 | 589 | sigset_t ksigmask, sigsaved; |
| 590 | 590 | struct timespec ts, end_time, *to = NULL; |
| ... | ... | @@ -650,7 +650,7 @@ |
| 650 | 650 | return -EFAULT; |
| 651 | 651 | } |
| 652 | 652 | |
| 653 | - return sys_pselect7(n, inp, outp, exp, tsp, up, sigsetsize); | |
| 653 | + return do_pselect(n, inp, outp, exp, tsp, up, sigsetsize); | |
| 654 | 654 | } |
| 655 | 655 | #endif /* HAVE_SET_RESTORE_SIGMASK */ |
| 656 | 656 |