Unverified Commit e15f5efb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6313 fixup CVE-2024-26908 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuntao Liu <liuyuntao12@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VH55PFWMDJ777T3QHSP6D2SK6O3N37EY/ 
fixup CVE-2024-26908

Kunwu Chan (1):
  x86/xen: Add some null pointer checking to smp.c


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9HK0E 
 
Link:https://gitee.com/openeuler/kernel/pulls/6313

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents b3e8831f 505b0b4a

arch/x86/xen/smp.c

+10 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ int xen_smp_intr_init(unsigned int cpu) 
	char *resched_name, *callfunc_name, *debug_name;



	resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu);

	if (!resched_name)

		goto fail_mem;

	rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR,

				    cpu,

				    xen_reschedule_interrupt,
@@ -77,6 +79,8 @@ int xen_smp_intr_init(unsigned int cpu) 
	per_cpu(xen_resched_irq, cpu).name = resched_name;



	callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu);

	if (!callfunc_name)

		goto fail_mem;

	rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,

				    cpu,

				    xen_call_function_interrupt,
@@ -89,6 +93,8 @@ int xen_smp_intr_init(unsigned int cpu) 
	per_cpu(xen_callfunc_irq, cpu).name = callfunc_name;



	debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);

	if (!debug_name)

		goto fail_mem;

	rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,

				     IRQF_PERCPU | IRQF_NOBALANCING,

				     debug_name, NULL);
@@ -98,6 +104,8 @@ int xen_smp_intr_init(unsigned int cpu) 
	per_cpu(xen_debug_irq, cpu).name = debug_name;



	callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);

	if (!callfunc_name)

		goto fail_mem;

	rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,

				    cpu,

				    xen_call_function_single_interrupt,
@@ -111,6 +119,8 @@ int xen_smp_intr_init(unsigned int cpu) 


	return 0;



 fail_mem:

	rc = -ENOMEM;

 fail:

	xen_smp_intr_free(cpu);

	return rc;