From: David Rientjes <rientjes@google.com>
To: Gavin Shan <shangw@linux.vnet.ibm.com>
Cc: linux-mm@kvack.org, dave@linux.vnet.ibm.com, mhocko@suse.cz,
akpm@linux-foundation.org
Subject: Re: [PATCH v3 2/3] mm/sparse: fix possible memory leak
Date: Mon, 2 Jul 2012 04:04:28 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.00.1207020404120.14758@chino.kir.corp.google.com> (raw)
In-Reply-To: <1341221337-4826-2-git-send-email-shangw@linux.vnet.ibm.com>
On Mon, 2 Jul 2012, Gavin Shan wrote:
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 781fa04..a6984d9 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -75,6 +75,20 @@ static struct mem_section noinline __init_refok *sparse_index_alloc(int nid)
> return section;
> }
>
> +static inline void __meminit sparse_index_free(struct mem_section *section)
> +{
> + unsigned long size = SECTIONS_PER_ROOT *
> + sizeof(struct mem_section);
> +
> + if (!section)
> + return;
> +
> + if (slab_is_available())
> + kfree(section);
> + else
> + free_bootmem(virt_to_phys(section), size);
Eek, does that work?
> +}
> +
> static int __meminit sparse_index_init(unsigned long section_nr, int nid)
> {
> static DEFINE_SPINLOCK(index_init_lock);
> @@ -102,6 +116,9 @@ static int __meminit sparse_index_init(unsigned long section_nr, int nid)
> mem_section[root] = section;
> out:
> spin_unlock(&index_init_lock);
> + if (ret)
> + sparse_index_free(section);
> +
> return ret;
> }
> #else /* !SPARSEMEM_EXTREME */
--
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:[~2012-07-02 11:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-02 9:28 [PATCH v3 1/3] mm/sparse: optimize sparse_index_alloc Gavin Shan
2012-07-02 9:28 ` [PATCH v3 2/3] mm/sparse: fix possible memory leak Gavin Shan
2012-07-02 9:43 ` Michal Hocko
2012-07-02 13:40 ` Gavin Shan
2012-07-02 15:46 ` Michal Hocko
2012-07-03 3:38 ` Gavin Shan
2012-07-03 12:51 ` Michal Hocko
2012-07-02 11:04 ` David Rientjes [this message]
2012-07-02 13:28 ` Gavin Shan
2012-07-02 21:19 ` David Rientjes
2012-07-03 1:19 ` Gavin Shan
2012-07-02 9:28 ` [PATCH v3 3/3] mm/sparse: more check on mem_section number Gavin Shan
2012-07-02 11:05 ` David Rientjes
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=alpine.DEB.2.00.1207020404120.14758@chino.kir.corp.google.com \
--to=rientjes@google.com \
--cc=akpm@linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
--cc=shangw@linux.vnet.ibm.com \
/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