[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4CA25E5C.2020203@kernel.org>
Date: Tue, 28 Sep 2010 14:30:04 -0700
From: Yinghai Lu <yinghai@...nel.org>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: Fwd: [PATCH] x86: Plug memory leak in sparse irq
> From: Thomas Gleixner <tglx@...utronix.de>
> Date: Tue, Sep 28, 2010 at 11:57 AM
> Subject: [PATCH] x86: Plug memory leak in sparse irq
> To: LKML <linux-kernel@...r.kernel.org>
> Cc: x86@...nel.org, Yinghai Lu <yhlu.kernel@...il.com>
>
>
> free_irq_cfg() is not freeing the cpumask_vars in irq_cfg.
>
> Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
> Cc: stable@...nel.org
> ---
> arch/x86/kernel/apic/io_apic.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/arch/x86/kernel/apic/io_apic.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c
> +++ linux-2.6/arch/x86/kernel/apic/io_apic.c
> @@ -311,9 +311,11 @@ void arch_init_copy_chip_data(struct irq
> init_copy_irq_2_pin(old_cfg, cfg, node);
> }
>
> -static void free_irq_cfg(struct irq_cfg *old_cfg)
> +static void free_irq_cfg(struct irq_cfg *cfg)
> {
> - kfree(old_cfg);
> + free_cpumask_var(cfg->domain);
> + free_cpumask_var(cfg->old_domain);
> + kfree(cfg);
> }
>
> void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc)
yes. still need
[PATCH] x86: copy cpumask while copying chip_data for offstack cpumask
While looking Thomas's
| x86: Plug memory leak in sparse irq
found copy_chip_data() could copy the cpumask pointers instead of real data.
Need to use cpumask_copy there.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Cc: stable@...nel.org
---
arch/x86/kernel/apic/io_apic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: linux-2.6/arch/x86/kernel/apic/io_apic.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/apic/io_apic.c
+++ linux-2.6/arch/x86/kernel/apic/io_apic.c
@@ -306,7 +306,10 @@ void arch_init_copy_chip_data(struct irq
old_cfg = old_desc->chip_data;
- memcpy(cfg, old_cfg, sizeof(struct irq_cfg));
+ cfg->vector = old_cfg->vector;
+ cfg->move_in_progress = old_cfg->move_in_progress;
+ cpumask_copy(cfg->domain, old_cfg->domain);
+ cpumask_copy(cfg->old_domain, old_cfg->old_domain);
init_copy_irq_2_pin(old_cfg, cfg, node);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists