diff options
| author | Alexandr Andreev <aandreev@openvz.org> | 2007-03-06 02:34:24 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-03-06 14:49:24 -0800 |
| commit | 50157b09b33c2ec3637d3b317b06a7235c57c7f2 (patch) | |
| tree | 83d66f438c0d7bb67a00aff9f3b5359556f72a36 /arch/ia64/ia32 | |
| parent | a27e5a13d5863bb9de0ac80cb4bb3f4442f0aad1 (diff) | |
| download | linux-50157b09b33c2ec3637d3b317b06a7235c57c7f2.tar.bz2 | |
[IA64] sync compat getdents
Add VERIFY_WRITE check in the beginning like compat_sys_getdents() (EINVAL vs
EFAULT).
Signed-off-by: Alexandr Andreev <aandreev@openvz.org>
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/ia32')
| -rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index d430d36ae49d..0afb4fe7c35b 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c @@ -1267,6 +1267,10 @@ sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned i struct getdents32_callback buf; int error; + error = -EFAULT; + if (!access_ok(VERIFY_WRITE, dirent, count)) + goto out; + error = -EBADF; file = fget(fd); if (!file) @@ -1283,10 +1287,10 @@ sys32_getdents (unsigned int fd, struct compat_dirent __user *dirent, unsigned i error = buf.error; lastdirent = buf.previous; if (lastdirent) { - error = -EINVAL; if (put_user(file->f_pos, &lastdirent->d_off)) - goto out_putf; - error = count - buf.count; + error = -EFAULT; + else + error = count - buf.count; } out_putf: |