diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-12 12:19:16 -0800 |
---|---|---|
committer | Christoph Lameter <clameter@sgi.com> | 2008-02-12 12:19:16 -0800 |
commit | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (patch) | |
tree | 17852dd654c37bf86cf3d98c692eef4c6fa73a2c /mm/memory.c | |
parent | 7cc718d56c8297bd3a3c106ca09e8abf9814bb27 (diff) | |
parent | 96b5a46e2a72dc1829370c87053e0cd558d58bc0 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index e5628a5fd67..717aa0e3be2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -989,6 +989,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, int i; unsigned int vm_flags; + if (len <= 0) + return 0; /* * Require read or write permissions. * If 'force' is set, we only require the "MAY" flags. |