diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 23:57:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 23:57:57 -0800 |
| commit | 8606ad0b90f6d01da350d71e374601799a81b69b (patch) | |
| tree | f6cb359c169f74b5650427f49f0df7155b1081c6 /fs | |
| parent | ca486f406c8c180c964dbe52a4d36429f4865d40 (diff) | |
| parent | 6bf784fa4fbe697cc87b42f65bce319bf9a98c20 (diff) | |
| download | history-8606ad0b90f6d01da350d71e374601799a81b69b.tar.gz | |
Merge bk://nfsclient.bkbits.net/linux-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/direct.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 6a2f9901f8cb2d..68df803f27caaa 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -91,8 +91,10 @@ nfs_get_user_pages(int rw, unsigned long user_addr, size_t size, /* set an arbitrary limit to prevent type overflow */ /* XXX: this can probably be as large as INT_MAX */ - if (size > MAX_DIRECTIO_SIZE) + if (size > MAX_DIRECTIO_SIZE) { + *pages = NULL; return -EFBIG; + } page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT; page_count -= user_addr >> PAGE_SHIFT; |