Messages in this thread Patch in this message | | | Date | Fri, 06 Nov 2009 14:14:27 -0800 | From | Greg KH <> | Subject | [29/99] do_mbind(): fix memory leak |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
commit b05ca7385a2848abdc72051f832722641daed8b0 upstream.
If migrate_prep is failed, new variable is leaked. This patch fixes it.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Acked-by: Christoph Lameter <cl@linux-foundation.org> 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@suse.de>
--- mm/mempolicy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
--- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1024,7 +1024,7 @@ static long do_mbind(unsigned long start err = migrate_prep(); if (err) - return err; + goto mpol_out; } { NODEMASK_SCRATCH(scratch); @@ -1039,10 +1039,9 @@ static long do_mbind(unsigned long start err = -ENOMEM; NODEMASK_SCRATCH_FREE(scratch); } - if (err) { - mpol_put(new); - return err; - } + if (err) + goto mpol_out; + vma = check_range(mm, start, end, nmask, flags | MPOL_MF_INVERT, &pagelist); @@ -1062,6 +1061,7 @@ static long do_mbind(unsigned long start putback_lru_pages(&pagelist); up_write(&mm->mmap_sem); + mpol_out: mpol_put(new); return err; }
| |