* [PATCH] FLAT: fix unmap len in load error path
@ 2010-05-26 8:43 Mike Frysinger
2010-05-28 6:26 ` David McCullough
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mike Frysinger @ 2010-05-26 8:43 UTC (permalink / raw)
To: uclinux-dev, David Howells, David McCullough, Greg Ungerer,
Paul Mundt
Cc: Andrew Morton, linux-kernel
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 <vapier@gentoo.org>
---
fs/binfmt_flat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 4959a0a..f7a4059 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;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] FLAT: fix unmap len in load error path
2010-05-26 8:43 [PATCH] FLAT: fix unmap len in load error path Mike Frysinger
@ 2010-05-28 6:26 ` David McCullough
2010-05-28 6:47 ` Greg Ungerer
2010-06-01 9:50 ` David Howells
2 siblings, 0 replies; 4+ messages in thread
From: David McCullough @ 2010-05-28 6:26 UTC (permalink / raw)
To: Mike Frysinger
Cc: uclinux-dev, David Howells, Greg Ungerer, Paul Mundt,
Andrew Morton, linux-kernel
Jivin Mike Frysinger lays it down ...
> 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 <vapier@gentoo.org>
Acked-by: David McCullough <david_mccullough@mcafee.com>
Cheers,
Davidm
> ---
> fs/binfmt_flat.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
> index 4959a0a..f7a4059 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;
> }
> --
> 1.7.1
>
>
>
--
David McCullough, david_mccullough@mcafee.com, Ph:+61 734352815
McAfee - SnapGear http://www.mcafee.com http://www.uCdot.org
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] FLAT: fix unmap len in load error path
2010-05-26 8:43 [PATCH] FLAT: fix unmap len in load error path Mike Frysinger
2010-05-28 6:26 ` David McCullough
@ 2010-05-28 6:47 ` Greg Ungerer
2010-06-01 9:50 ` David Howells
2 siblings, 0 replies; 4+ messages in thread
From: Greg Ungerer @ 2010-05-28 6:47 UTC (permalink / raw)
To: Mike Frysinger
Cc: uclinux-dev, David Howells, David McCullough, Greg Ungerer,
Paul Mundt, Andrew Morton, linux-kernel
Mike Frysinger wrote:
> 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 <vapier@gentoo.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
> ---
> fs/binfmt_flat.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
> index 4959a0a..f7a4059 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;
> }
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] FLAT: fix unmap len in load error path
2010-05-26 8:43 [PATCH] FLAT: fix unmap len in load error path Mike Frysinger
2010-05-28 6:26 ` David McCullough
2010-05-28 6:47 ` Greg Ungerer
@ 2010-06-01 9:50 ` David Howells
2 siblings, 0 replies; 4+ messages in thread
From: David Howells @ 2010-06-01 9:50 UTC (permalink / raw)
To: Mike Frysinger
Cc: dhowells, uclinux-dev, David McCullough, Greg Ungerer, Paul Mundt,
Andrew Morton, linux-kernel
Mike Frysinger <vapier@gentoo.org> wrote:
> 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 <vapier@gentoo.org>
Acked-by: David Howells <dhowells@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-06-01 9:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-26 8:43 [PATCH] FLAT: fix unmap len in load error path Mike Frysinger
2010-05-28 6:26 ` David McCullough
2010-05-28 6:47 ` Greg Ungerer
2010-06-01 9:50 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox