hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kexec: fix memory leak in function kimage_normal_alloc 

If kimage_normal_alloc() fails to alloc pages for image->swap_page, it
should call kimage_free_page_list() to free allocated pages in
image->control_pages list before it frees image.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Zhang Yanfei 2013-02-27 17:03:29 -08:00 committed by Linus Torvalds
parent fe88f2ee33
commit b92e7e0dae
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/kexec.c
View File

@ -229,6 +229,8 @@ out:
} }
static void kimage_free_page_list(struct list_head *list);
static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry, static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
unsigned long nr_segments, unsigned long nr_segments,
struct kexec_segment __user *segments) struct kexec_segment __user *segments)
@ -252,22 +254,22 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
get_order(KEXEC_CONTROL_PAGE_SIZE)); get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) { if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n"); printk(KERN_ERR "Could not allocate control_code_buffer\n");
goto out; goto out_free;
} }
image->swap_page = kimage_alloc_control_pages(image, 0); image->swap_page = kimage_alloc_control_pages(image, 0);
if (!image->swap_page) { if (!image->swap_page) {
printk(KERN_ERR "Could not allocate swap buffer\n"); printk(KERN_ERR "Could not allocate swap buffer\n");
goto out; goto out_free;
} }
result = 0; *rimage = image;
out: return 0;
if (result == 0)
*rimage = image;
else
kfree(image);
out_free:
kimage_free_page_list(&image->control_pages);
kfree(image);
out:
return result; return result;
} }