Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9756b15e1b58453a6fd54b85c1ad8515209e10bb

Authored by Yinghai Lu
Committed by Ingo Molnar
1 parent 8fe74cf053
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

irq: fix cpumask memory leak on offstack cpumask kernels 

Need to free the old cpumask for affinity and pending_mask.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <49D18FF0.50707@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 2 changed files with 15 additions and 0 deletions Side-by-side Diff

... ... @@ -482,6 +482,16 @@
482 482 #endif
483 483 }
484 484  
  485 +static inline void free_desc_masks(struct irq_desc *old_desc,
  486 + struct irq_desc *new_desc)
  487 +{
  488 + free_cpumask_var(old_desc->affinity);
  489 +
  490 +#ifdef CONFIG_GENERIC_PENDING_IRQ
  491 + free_cpumask_var(old_desc->pending_mask);
  492 +#endif
  493 +}
  494 +
485 495 #else /* !CONFIG_SMP */
486 496  
487 497 static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu,
... ... @@ -495,6 +505,10 @@
495 505 {
496 506 }
497 507  
  508 +static inline void free_desc_masks(struct irq_desc *old_desc,
  509 + struct irq_desc *new_desc)
  510 +{
  511 +}
498 512 #endif /* CONFIG_SMP */
499 513  
500 514 #endif /* _LINUX_IRQ_H */
kernel/irq/numa_migrate.c
Diff comments   View file @ 9756b15
... ... @@ -54,6 +54,7 @@
54 54 static void free_one_irq_desc(struct irq_desc *old_desc, struct irq_desc *desc)
55 55 {
56 56 free_kstat_irqs(old_desc, desc);
  57 + free_desc_masks(old_desc, desc);
57 58 arch_free_chip_data(old_desc, desc);
58 59 }
59 60