flat: fix unmap len in load error path

1da083c9 · Mike Frysinger <[email protected]> · 2010-06-04 14:14:55 -07:00

The data chunk is mmaped with 'len' which remains unchanged, so use that
when unmapping in the error path rather than trying to recalculate (and
incorrectly so) the value used originally.

Signed-off-by: Mike Frysinger <[email protected]>
Acked-by: David McCullough <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Hirokazu Takata <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Acked-by: David Howells <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 1da083c9b23dafd6bcb08dcfec443e66e90efff0
Parents: 2e94de8a

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/binfmt_flat.c	modified	+1	−1	View file

fs/binfmt_flat.c

View file

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index b865622..b6ab27c 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -596,7 +596,7 @@ static int load_flat_file(struct linux_binprm * bprm,
 		if (IS_ERR_VALUE(result)) {
 			printk("Unable to read data+bss, errno %d\n", (int)-result);
 			do_munmap(current->mm, textpos, text_len);
-			do_munmap(current->mm, realdatastart, data_len + extra);
+			do_munmap(current->mm, realdatastart, len);
 			ret = result;
 			goto err;
 		}