From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx173.postini.com [74.125.245.173]) by kanga.kvack.org (Postfix) with SMTP id 06A9F6B00EB for ; Mon, 11 Jun 2012 05:18:34 -0400 (EDT) Received: by mail-yx0-f169.google.com with SMTP id m7so3017133yen.14 for ; Mon, 11 Jun 2012 02:18:34 -0700 (PDT) From: kosaki.motohiro@gmail.com Subject: [PATCH 4/6] mempolicy: fix refcount leak in mpol_set_shared_policy() Date: Mon, 11 Jun 2012 05:17:28 -0400 Message-Id: <1339406250-10169-5-git-send-email-kosaki.motohiro@gmail.com> In-Reply-To: <1339406250-10169-1-git-send-email-kosaki.motohiro@gmail.com> References: <1339406250-10169-1-git-send-email-kosaki.motohiro@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , Dave Jones , Mel Gorman , Christoph Lameter , stable@vger.kernel.org, KOSAKI Motohiro , Andrew Morton From: KOSAKI Motohiro When shared_policy_replace() failure, new->policy is not freed correctly. The real problem is, shared mempolicy codes directly call kmem_cache_free() in multiple place. This patch creates proper wrapper function and uses it. Note: The bug was introduced pre-git age (IOW, before 2.6.12-rc2). Cc: Dave Jones , Cc: Mel Gorman Cc: Christoph Lameter , Cc: Andrew Morton Cc: Signed-off-by: KOSAKI Motohiro --- mm/mempolicy.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index d97d2db..7fb7d51 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2150,12 +2150,17 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx) return pol; } +static void sp_free(struct sp_node *n) +{ + mpol_put(n->policy); + kmem_cache_free(sn_cache, n); +} + static void sp_delete(struct shared_policy *sp, struct sp_node *n) { pr_debug("deleting %lx-l%lx\n", n->start, n->end); rb_erase(&n->nd, &sp->root); - mpol_put(n->policy); - kmem_cache_free(sn_cache, n); + sp_free(n); } static void sp_node_init(struct sp_node *node, unsigned long start, @@ -2320,7 +2325,7 @@ int mpol_set_shared_policy(struct shared_policy *info, } err = shared_policy_replace(info, vma->vm_pgoff, vma->vm_pgoff+sz, new); if (err && new) - kmem_cache_free(sn_cache, new); + sp_free(new); return err; } @@ -2337,9 +2342,7 @@ void mpol_free_shared_policy(struct shared_policy *p) while (next) { n = rb_entry(next, struct sp_node, nd); next = rb_next(&n->nd); - rb_erase(&n->nd, &p->root); - mpol_put(n->policy); - kmem_cache_free(sn_cache, n); + sp_delete(p, n); } spin_unlock(&p->lock); } -- 1.7.1 -- 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: email@kvack.org