diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-05-28 15:44:24 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-06-15 14:00:57 -0400 |
| commit | a2a3d75bc59265924869f15741cce2a8bcce398c (patch) | |
| tree | 5190550997ccc600dc4a89b2a1987722b9048be6 /fs | |
| parent | 0096d0ccb701079017f2ad698d56b89838251724 (diff) | |
fs/binfmt_elf.c:load_elf_binary(): return -EINVAL on zero-length mappings
[ Upstream commit 073aba98f6a2235e2ac4a8402b1a131ab032876e ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 3dd249787b11..e39fe28f1ea0 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -816,7 +816,7 @@ static int load_elf_binary(struct linux_binprm *bprm) total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum); if (!total_size) { - error = -EINVAL; + retval = -EINVAL; goto out_free_dentry; } } |