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

Commit 36a45e74 authored by Wei Yongjun's avatar Wei Yongjun Committed by Tony Luck
Browse files

[IA64] kexec: Move the dereference below the NULL test 

The dereference should be moved below the NULL test.

spatch with a semantic match is used to found this.
(http://coccinelle.lip6.fr/

)

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 7cd10a60

arch/ia64/kernel/machine_kexec.c

+2 −1
Original line number Diff line number Diff line
@@ -85,12 +85,13 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg) 
	struct kimage *image = arg;

	relocate_new_kernel_t rnk;

	void *pal_addr = efi_get_pal_addr();

	unsigned long code_addr = (unsigned long)page_address(image->control_code_page);

	unsigned long code_addr;

	int ii;

	u64 fp, gp;

	ia64_fptr_t *init_handler = (ia64_fptr_t *)ia64_os_init_on_kdump;



	BUG_ON(!image);

	code_addr = (unsigned long)page_address(image->control_code_page);

	if (image->type == KEXEC_TYPE_CRASH) {

		crash_save_this_cpu();

		current->thread.ksp = (__u64)info->sw - 16;