| Message ID | 20210117021054.5BTRxoFeg%akpm@linux-foundation.org |
|---|---|
| State | New |
| Headers | show |
| Series | [merged] mm-vmallocc-fix-potential-memory-leak.patch removed from -mm tree | expand |
--- a/mm/vmalloc.c~mm-vmallocc-fix-potential-memory-leak +++ a/mm/vmalloc.c @@ -2420,8 +2420,10 @@ void *vmap(struct page **pages, unsigned return NULL; } - if (flags & VM_MAP_PUT_PAGES) + if (flags & VM_MAP_PUT_PAGES) { area->pages = pages; + area->nr_pages = count; + } return area->addr; } EXPORT_SYMBOL(vmap);
The patch titled Subject: mm/vmalloc.c: fix potential memory leak has been removed from the -mm tree. Its filename was mm-vmallocc-fix-potential-memory-leak.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Miaohe Lin <linmiaohe@huawei.com> Subject: mm/vmalloc.c: fix potential memory leak In VM_MAP_PUT_PAGES case, we should put pages and free array in vfree. But we missed to set area->nr_pages in vmap(). So we would failed to put pages in __vunmap() because area->nr_pages = 0. Link: https://lkml.kernel.org/r/20210107123541.39206-1-linmiaohe@huawei.com Fixes: b944afc9d64d ("mm: add a VM_MAP_PUT_PAGES flag for vmap") Signed-off-by: Shijie Luo <luoshijie1@huawei.com> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/vmalloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)