diff options
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 3ebb06e62c20..96c104b7b41c 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -57,6 +57,7 @@ #define NFSDBG_FACILITY NFSDBG_VFS #define MAX_DIRECTIO_SIZE (4096UL << PAGE_SHIFT) +static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty); static kmem_cache_t *nfs_direct_cachep; /* @@ -106,12 +107,16 @@ nfs_get_user_pages(int rw, unsigned long user_addr, size_t size, result = get_user_pages(current, current->mm, user_addr, page_count, (rw == READ), 0, *pages, NULL); + up_read(¤t->mm->mmap_sem); + /* + * If we got fewer pages than expected from get_user_pages(), + * the user buffer runs off the end of a mapping; return EFAULT. + */ if (result >= 0 && result < page_count) { nfs_free_user_pages(*pages, result, 0); *pages = NULL; result = -EFAULT; } - up_read(¤t->mm->mmap_sem); } return result; } |