| From 2b1d3ae940acd11be44c6eced5873d47c2e00ffa Mon Sep 17 00:00:00 2001 |
| From: Andrew Morton <akpm@linux-foundation.org> |
| Date: Thu, 28 May 2015 15:44:24 -0700 |
| Subject: fs/binfmt_elf.c:load_elf_binary(): return -EINVAL on zero-length mappings |
| |
| From: Andrew Morton <akpm@linux-foundation.org> |
| |
| commit 2b1d3ae940acd11be44c6eced5873d47c2e00ffa upstream. |
| |
| load_elf_binary() returns `retval', not `error'. |
| |
| Fixes: a87938b2e246b81b4fb ("fs/binfmt_elf.c: fix bug in loading of PIE binaries") |
| Reported-by: James Hogan <james.hogan@imgtec.com> |
| Cc: Michael Davidson <md@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/binfmt_elf.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/binfmt_elf.c |
| +++ b/fs/binfmt_elf.c |
| @@ -819,7 +819,7 @@ static int load_elf_binary(struct linux_ |
| total_size = total_mapping_size(elf_phdata, |
| loc->elf_ex.e_phnum); |
| if (!total_size) { |
| - error = -EINVAL; |
| + retval = -EINVAL; |
| goto out_free_dentry; |
| } |
| } |
