diff options
-rw-r--r-- | kernel/kexec.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 6b7455e3c96b..bddd3d7a74b6 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -316,7 +316,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, | |||
316 | mend = mstart + image->segment[i].memsz - 1; | 316 | mend = mstart + image->segment[i].memsz - 1; |
317 | /* Ensure we are within the crash kernel limits */ | 317 | /* Ensure we are within the crash kernel limits */ |
318 | if ((mstart < crashk_res.start) || (mend > crashk_res.end)) | 318 | if ((mstart < crashk_res.start) || (mend > crashk_res.end)) |
319 | goto out; | 319 | goto out_free; |
320 | } | 320 | } |
321 | 321 | ||
322 | /* | 322 | /* |
@@ -329,16 +329,15 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, | |||
329 | get_order(KEXEC_CONTROL_PAGE_SIZE)); | 329 | get_order(KEXEC_CONTROL_PAGE_SIZE)); |
330 | if (!image->control_code_page) { | 330 | if (!image->control_code_page) { |
331 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); | 331 | printk(KERN_ERR "Could not allocate control_code_buffer\n"); |
332 | goto out; | 332 | goto out_free; |
333 | } | 333 | } |
334 | 334 | ||
335 | result = 0; | 335 | *rimage = image; |
336 | out: | 336 | return 0; |
337 | if (result == 0) | ||
338 | *rimage = image; | ||
339 | else | ||
340 | kfree(image); | ||
341 | 337 | ||
338 | out_free: | ||
339 | kfree(image); | ||
340 | out: | ||
342 | return result; | 341 | return result; |
343 | } | 342 | } |
344 | 343 | ||