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

Commit 29198f66 authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by Greg Kroah-Hartman
Browse files

x86/xen: Fix memory leak in xen_init_lock_cpu() 



[ Upstream commit ca84ce153d887b1dc8b118029976cc9faf2a9b40 ]

In xen_init_lock_cpu(), the @name has allocated new string by kasprintf(),
if bind_ipi_to_irqhandler() fails, it should be freed, otherwise may lead
to a memory leak issue, fix it.

Fixes: 2d9e1e2f ("xen: implement Xen-specific spinlocks")
Signed-off-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20221123155858.11382-3-xiujianfeng@huawei.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec882542

arch/x86/xen/spinlock.c

+3 −3
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ void xen_init_lock_cpu(int cpu) 
	     cpu, per_cpu(lock_kicker_irq, cpu));



	name = kasprintf(GFP_KERNEL, "spinlock%d", cpu);

	per_cpu(irq_name, cpu) = name;

	irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR,

				     cpu,

				     dummy_handler,
@@ -85,7 +86,6 @@ void xen_init_lock_cpu(int cpu) 
	if (irq >= 0) {

		disable_irq(irq); /* make sure it's never delivered */

		per_cpu(lock_kicker_irq, cpu) = irq;

		per_cpu(irq_name, cpu) = name;

	}



	printk("cpu %d spinlock event irq %d\n", cpu, irq);
@@ -98,6 +98,8 @@ void xen_uninit_lock_cpu(int cpu) 
	if (!xen_pvspin)

		return;



	kfree(per_cpu(irq_name, cpu));

	per_cpu(irq_name, cpu) = NULL;

	/*

	 * When booting the kernel with 'mitigations=auto,nosmt', the secondary

	 * CPUs are not activated, and lock_kicker_irq is not initialized.
@@ -108,8 +110,6 @@ void xen_uninit_lock_cpu(int cpu) 


	unbind_from_irqhandler(irq, NULL);

	per_cpu(lock_kicker_irq, cpu) = -1;

	kfree(per_cpu(irq_name, cpu));

	per_cpu(irq_name, cpu) = NULL;

}



PV_CALLEE_SAVE_REGS_THUNK(xen_vcpu_stolen);