diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
tree | 64b6b9655e944284937f5eeff643f0754f35d0af /fs/compat.c | |
parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'fs/compat.c')
-rw-r--r-- | fs/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c index f0b391c50552..6490d2134ff3 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -626,7 +626,7 @@ ssize_t compat_rw_copy_check_uvector(int type, | |||
626 | tot_len += len; | 626 | tot_len += len; |
627 | if (tot_len < tmp) /* maths overflow on the compat_ssize_t */ | 627 | if (tot_len < tmp) /* maths overflow on the compat_ssize_t */ |
628 | goto out; | 628 | goto out; |
629 | if (!access_ok(vrfy_dir(type), buf, len)) { | 629 | if (!access_ok(vrfy_dir(type), compat_ptr(buf), len)) { |
630 | ret = -EFAULT; | 630 | ret = -EFAULT; |
631 | goto out; | 631 | goto out; |
632 | } | 632 | } |