xen/smp: Don't leak interrupt name when offlining.

[~andy/linux] / arch / x86 / xen / smp.c

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 6a483cdd28c986e623b7f19635f5bdc49906ac30..37fbe71795c1335918349f72b66ed8e114dcd9e6 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -107,19 +107,27 @@ static void xen_smp_intr_free(unsigned int cpu)
        if (per_cpu(xen_resched_irq, cpu).irq >= 0) {
                unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu).irq, NULL);
                per_cpu(xen_resched_irq, cpu).irq = -1;
+               kfree(per_cpu(xen_resched_irq, cpu).name);
+               per_cpu(xen_resched_irq, cpu).name = NULL;
        }
        if (per_cpu(xen_callfunc_irq, cpu).irq >= 0) {
                unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu).irq, NULL);
                per_cpu(xen_callfunc_irq, cpu).irq = -1;
+               kfree(per_cpu(xen_callfunc_irq, cpu).name);
+               per_cpu(xen_callfunc_irq, cpu).name = NULL;
        }
        if (per_cpu(xen_debug_irq, cpu).irq >= 0) {
                unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu).irq, NULL);
                per_cpu(xen_debug_irq, cpu).irq = -1;
+               kfree(per_cpu(xen_debug_irq, cpu).name);
+               per_cpu(xen_debug_irq, cpu).name = NULL;
        }
        if (per_cpu(xen_callfuncsingle_irq, cpu).irq >= 0) {
                unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu).irq,
                                       NULL);
                per_cpu(xen_callfuncsingle_irq, cpu).irq = -1;
+               kfree(per_cpu(xen_callfuncsingle_irq, cpu).name);
+               per_cpu(xen_callfuncsingle_irq, cpu).name = NULL;
        }
        if (xen_hvm_domain())
                return;
@@ -127,12 +135,14 @@ static void xen_smp_intr_free(unsigned int cpu)
        if (per_cpu(xen_irq_work, cpu).irq >= 0) {
                unbind_from_irqhandler(per_cpu(xen_irq_work, cpu).irq, NULL);
                per_cpu(xen_irq_work, cpu).irq = -1;
+               kfree(per_cpu(xen_irq_work, cpu).name);
+               per_cpu(xen_irq_work, cpu).name = NULL;
        }
 };
 static int xen_smp_intr_init(unsigned int cpu)
 {
        int rc;
-       const char *resched_name, *callfunc_name, *debug_name;
+       char *resched_name, *callfunc_name, *debug_name;
 
        resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu);
        rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR,
@@ -144,6 +154,7 @@ static int xen_smp_intr_init(unsigned int cpu)
        if (rc < 0)
                goto fail;
        per_cpu(xen_resched_irq, cpu).irq = rc;
+       per_cpu(xen_resched_irq, cpu).name = resched_name;
 
        callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu);
        rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,
@@ -155,6 +166,7 @@ static int xen_smp_intr_init(unsigned int cpu)
        if (rc < 0)
                goto fail;
        per_cpu(xen_callfunc_irq, cpu).irq = rc;
+       per_cpu(xen_callfunc_irq, cpu).name = callfunc_name;
 
        debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);
        rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,
@@ -163,6 +175,7 @@ static int xen_smp_intr_init(unsigned int cpu)
        if (rc < 0)
                goto fail;
        per_cpu(xen_debug_irq, cpu).irq = rc;
+       per_cpu(xen_debug_irq, cpu).name = debug_name;
 
        callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);
        rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,
@@ -174,6 +187,7 @@ static int xen_smp_intr_init(unsigned int cpu)
        if (rc < 0)
                goto fail;
        per_cpu(xen_callfuncsingle_irq, cpu).irq = rc;
+       per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name;
 
        /*
         * The IRQ worker on PVHVM goes through the native path and uses the
@@ -192,6 +206,7 @@ static int xen_smp_intr_init(unsigned int cpu)
        if (rc < 0)
                goto fail;
        per_cpu(xen_irq_work, cpu).irq = rc;
+       per_cpu(xen_irq_work, cpu).name = callfunc_name;
 
        return 0;