diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /fs/select.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/select.c b/fs/select.c index c0f02d36c60e..bc60a3e14ef3 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -510,9 +510,9 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, | |||
| 510 | 510 | ||
| 511 | if (sig) { | 511 | if (sig) { |
| 512 | if (!access_ok(VERIFY_READ, sig, sizeof(void *)+sizeof(size_t)) | 512 | if (!access_ok(VERIFY_READ, sig, sizeof(void *)+sizeof(size_t)) |
| 513 | || __get_user(up, (sigset_t * __user *)sig) | 513 | || __get_user(up, (sigset_t __user * __user *)sig) |
| 514 | || __get_user(sigsetsize, | 514 | || __get_user(sigsetsize, |
| 515 | (size_t * __user)(sig+sizeof(void *)))) | 515 | (size_t __user *)(sig+sizeof(void *)))) |
| 516 | return -EFAULT; | 516 | return -EFAULT; |
| 517 | } | 517 | } |
| 518 | 518 | ||