android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kexec: avoid freeing NULL pointer in image_crash_alloc()

Browse Source 
Though there is no error if we free a NULL pointer, I think we could
avoid this behaviour.  Change the code a little in kimage_crash_alloc()
could avoid this kind of unnecessary free.

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:31 -08:00 committed by Linus Torvalds
parent b92e7e0dae
commit 8c333ac2e4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/kexec.c
View File

@ -316,7 +316,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
mend = mstart + image->segment[i].memsz - 1; mend = mstart + image->segment[i].memsz - 1;
/* Ensure we are within the crash kernel limits */ /* Ensure we are within the crash kernel limits */
if ((mstart < crashk_res.start) || (mend > crashk_res.end)) if ((mstart < crashk_res.start) || (mend > crashk_res.end))
goto out; goto out_free;
} }
/* /*
@ -329,16 +329,15 @@ static int kimage_crash_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;
} }
result = 0; *rimage = image;
out: return 0;
if (result == 0)
*rimage = image;
else
kfree(image);
out_free:
kfree(image);
out:
return result; return result;
} }