diff options
| author | Anton Blanchard <anton@samba.org> | 2009-11-11 14:26:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 07:25:58 -0800 |
| commit | fc63cf237078c86214abcb2ee9926d8ad289da9b (patch) | |
| tree | 3af8571390aec334b7f47c08ba0cff0a72d6fbb3 /fs | |
| parent | 93f40e6f1493ae0c1e04760b221c125ef5e47205 (diff) | |
| download | linux-stable-fc63cf237078c86214abcb2ee9926d8ad289da9b.tar.gz linux-stable-fc63cf237078c86214abcb2ee9926d8ad289da9b.tar.bz2 linux-stable-fc63cf237078c86214abcb2ee9926d8ad289da9b.zip | |
exec: setup_arg_pages() fails to return errors
In setup_arg_pages we work hard to assign a value to ret, but on exit we
always return 0.
Also remove a now duplicated exit path and branch to out_unlock instead.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/exec.c b/fs/exec.c index d49be6bc1793..ba112bd4a339 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -624,10 +624,8 @@ int setup_arg_pages(struct linux_binprm *bprm, /* Move stack pages down in memory. */ if (stack_shift) { ret = shift_arg_pages(vma, stack_shift); - if (ret) { - up_write(&mm->mmap_sem); - return ret; - } + if (ret) + goto out_unlock; } #ifdef CONFIG_STACK_GROWSUP @@ -641,7 +639,7 @@ int setup_arg_pages(struct linux_binprm *bprm, out_unlock: up_write(&mm->mmap_sem); - return 0; + return ret; } EXPORT_SYMBOL(setup_arg_pages); |