From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: kosaki.motohiro@jp.fujitsu.com, linux-mm <linux-mm@kvack.org>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Lameter <cl@linux-foundation.org>
Subject: [PATCH 3/3] Fix memory leak of do_mbind()
Date: Fri, 9 Oct 2009 10:09:18 +0900 (JST) [thread overview]
Message-ID: <20091009100837.128A.A69D9226@jp.fujitsu.com> (raw)
In-Reply-To: <20091009100527.1284.A69D9226@jp.fujitsu.com>
If migrate_prep is failed, new variable is leaked.
This patch fixes it.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
---
mm/mempolicy.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 824abf3..38ce2a7 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1027,7 +1027,7 @@ static long do_mbind(unsigned long start, unsigned long len,
err = migrate_prep();
if (err)
- return err;
+ goto mpol_out;
}
{
NODEMASK_SCRATCH(scratch);
@@ -1042,10 +1042,9 @@ static long do_mbind(unsigned long start, unsigned long len,
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);
@@ -1066,6 +1065,7 @@ static long do_mbind(unsigned long start, unsigned long len,
}
up_write(&mm->mmap_sem);
+ mpol_out:
mpol_put(new);
return err;
}
--
1.6.0.GIT
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2009-10-09 1:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 1:06 [PATCH 1/3] mm: move inc_zone_page_state(NR_ISOLATED) to just isolated place KOSAKI Motohiro
2009-10-09 1:08 ` [PATCH 2/3] Fix memory leak of never putback pages in mbind() KOSAKI Motohiro
2009-10-09 8:46 ` KOSAKI Motohiro
2009-10-09 13:48 ` Christoph Lameter
2009-10-10 15:35 ` KOSAKI Motohiro
2009-10-09 13:41 ` Christoph Lameter
2009-10-09 1:09 ` KOSAKI Motohiro [this message]
2009-10-09 13:44 ` [PATCH 3/3] Fix memory leak of do_mbind() Christoph Lameter
2009-10-09 13:39 ` [PATCH 1/3] mm: move inc_zone_page_state(NR_ISOLATED) to just isolated place Christoph Lameter
2009-10-13 18:59 ` Andrew Morton
2009-10-15 1:54 ` KOSAKI Motohiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091009100837.128A.A69D9226@jp.fujitsu.com \
--to=kosaki.motohiro@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox