Skip to content

Commit

Permalink
kexec: fix memory leak in function kimage_normal_alloc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhang Yanfei authored and Linus Torvalds committed Feb 28, 2013
1 parent fe88f2e commit b92e7e0
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions kernel/kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,

}

static void kimage_free_page_list(struct list_head *list);

static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
unsigned long nr_segments,
struct kexec_segment __user *segments)
Expand All @@ -252,22 +254,22 @@ static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
get_order(KEXEC_CONTROL_PAGE_SIZE));
if (!image->control_code_page) {
printk(KERN_ERR "Could not allocate control_code_buffer\n");
goto out;
goto out_free;
}

image->swap_page = kimage_alloc_control_pages(image, 0);
if (!image->swap_page) {
printk(KERN_ERR "Could not allocate swap buffer\n");
goto out;
goto out_free;
}

result = 0;
out:
if (result == 0)
*rimage = image;
else
kfree(image);
*rimage = image;
return 0;

out_free:
kimage_free_page_list(&image->control_pages);
kfree(image);
out:
return result;
}

Expand Down

0 comments on commit b92e7e0

Please sign in to comment.