Messages in this thread Patch in this message | | | Date | Tue, 27 Nov 2007 10:26:10 +0800 | From | WANG Cong <> | Subject | [Patch](Resend) mm/sparse.c: Improve the error handling for sparse_add_one_section() |
| |
On Mon, Nov 26, 2007 at 07:19:49PM +0900, Yasunori Goto wrote: >Hi, Cong-san. > >> ms->section_mem_map |= SECTION_MARKED_PRESENT; >> >> ret = sparse_init_one_section(ms, section_nr, memmap, usemap); >> >> out: >> pgdat_resize_unlock(pgdat, &flags); >> - if (ret <= 0) >> - __kfree_section_memmap(memmap, nr_pages); >> + >> return ret; >> } >> #endif > >Hmm. When sparse_init_one_section() returns error, memmap and >usemap should be free.
Hi, Yasunori.
Thanks for your comments. Is the following one fine for you?
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
---
Index: linux-2.6/mm/sparse.c =================================================================== --- linux-2.6.orig/mm/sparse.c +++ linux-2.6/mm/sparse.c @@ -391,9 +391,17 @@ int sparse_add_one_section(struct zone * * no locking for this, because it does its own * plus, it does a kmalloc */ - sparse_index_init(section_nr, pgdat->node_id); + ret = sparse_index_init(section_nr, pgdat->node_id); + if (ret < 0) + return ret; memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, nr_pages); + if (!memmap) + return -ENOMEM; usemap = __kmalloc_section_usemap(); + if (!usemap) { + __kfree_section_memmap(memmap, nr_pages); + return -ENOMEM; + } pgdat_resize_lock(pgdat, &flags); @@ -403,10 +411,6 @@ int sparse_add_one_section(struct zone * goto out; } - if (!usemap) { - ret = -ENOMEM; - goto out; - } ms->section_mem_map |= SECTION_MARKED_PRESENT; ret = sparse_init_one_section(ms, section_nr, memmap, usemap); @@ -414,7 +418,7 @@ int sparse_add_one_section(struct zone * out: pgdat_resize_unlock(pgdat, &flags); if (ret <= 0) - __kfree_section_memmap(memmap, nr_pages); + kfree(usemap); return ret; } #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |