Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c333ac2 authored by Zhang Yanfei's avatar Zhang Yanfei Committed by Linus Torvalds
Browse files

kexec: avoid freeing NULL pointer in image_crash_alloc() 



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: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Reviewed-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b92e7e0d

kernel/kexec.c

+7 −8
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, 
		mend = mstart + image->segment[i].memsz - 1;

		/* Ensure we are within the crash kernel limits */

		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));

	if (!image->control_code_page) {

		printk(KERN_ERR "Could not allocate control_code_buffer\n");

		goto out;

		goto out_free;

	}



	result = 0;

out:

	if (result == 0)

	*rimage = image;

	else

		kfree(image);

	return 0;



out_free:

	kfree(image);

out:

	return result;

}