2022-11-19 09:27:35

by Xiu Jianfeng

Subject: [PATCH 1/2] x86/xen: Fix memory leak in xen_smp_intr_init{_pv}()

These local variables @{resched|pmu|callfunc...}_name saves the new
string allocated by kasprintf(), and when bind_{v}ipi_to_irqhandler()
fails, it goes to the @fail tag, and calls xen_smp_intr_free{_pv}() to
free resource, however the new string is not saved, which cause a memory
leak issue. fix it.

Fixes: 9702785a747a ("i386: move xen")
Signed-off-by: Xiu Jianfeng <[email protected]>
---
arch/x86/xen/smp.c | 16 ++++++++++++----
arch/x86/xen/smp_pv.c | 8 ++++++--
2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index c3e1f9a7d43a..6e9426b6b18a 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -71,8 +71,10 @@ int xen_smp_intr_init(unsigned int cpu)
IRQF_PERCPU|IRQF_NOBALANCING,
resched_name,
NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(resched_name);
goto fail;
+ }
per_cpu(xen_resched_irq, cpu).irq = rc;
per_cpu(xen_resched_irq, cpu).name = resched_name;

@@ -83,8 +85,10 @@ int xen_smp_intr_init(unsigned int cpu)
IRQF_PERCPU|IRQF_NOBALANCING,
callfunc_name,
NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(callfunc_name);
goto fail;
+ }
per_cpu(xen_callfunc_irq, cpu).irq = rc;
per_cpu(xen_callfunc_irq, cpu).name = callfunc_name;

@@ -94,8 +98,10 @@ int xen_smp_intr_init(unsigned int cpu)
xen_debug_interrupt,
IRQF_PERCPU | IRQF_NOBALANCING,
debug_name, NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(debug_name);
goto fail;
+ }
per_cpu(xen_debug_irq, cpu).irq = rc;
per_cpu(xen_debug_irq, cpu).name = debug_name;
}
@@ -107,8 +113,10 @@ int xen_smp_intr_init(unsigned int cpu)
IRQF_PERCPU|IRQF_NOBALANCING,
callfunc_name,
NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(callfunc_name);
goto fail;
+ }
per_cpu(xen_callfuncsingle_irq, cpu).irq = rc;
per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name;

diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index 480be82e9b7b..228d0207380c 100644
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -124,8 +124,10 @@ int xen_smp_intr_init_pv(unsigned int cpu)
IRQF_PERCPU|IRQF_NOBALANCING,
callfunc_name,
NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(callfunc_name);
goto fail;
+ }
per_cpu(xen_irq_work, cpu).irq = rc;
per_cpu(xen_irq_work, cpu).name = callfunc_name;

@@ -135,8 +137,10 @@ int xen_smp_intr_init_pv(unsigned int cpu)
xen_pmu_irq_handler,
IRQF_PERCPU|IRQF_NOBALANCING,
pmu_name, NULL);
- if (rc < 0)
+ if (rc < 0) {
+ kfree(pmu_name);
goto fail;
+ }
per_cpu(xen_pmu_irq, cpu).irq = rc;
per_cpu(xen_pmu_irq, cpu).name = pmu_name;
}
--
2.17.1