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

Commit 9756b15e authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

irq: fix cpumask memory leak on offstack cpumask kernels 



Need to free the old cpumask for affinity and pending_mask.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <49D18FF0.50707@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8fe74cf0

include/linux/irq.h

+14 −0
Original line number Diff line number Diff line
@@ -482,6 +482,16 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc, 
#endif

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

	free_cpumask_var(old_desc->affinity);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	free_cpumask_var(old_desc->pending_mask);

#endif

}



#else /* !CONFIG_SMP */



static inline bool init_alloc_desc_masks(struct irq_desc *desc, int cpu,
@@ -495,6 +505,10 @@ static inline void init_copy_desc_masks(struct irq_desc *old_desc, 
{

}



static inline void free_desc_masks(struct irq_desc *old_desc,

				   struct irq_desc *new_desc)

{

}

#endif	/* CONFIG_SMP */



#endif /* _LINUX_IRQ_H */

kernel/irq/numa_migrate.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static bool init_copy_one_irq_desc(int irq, struct irq_desc *old_desc, 
static void free_one_irq_desc(struct irq_desc *old_desc, struct irq_desc *desc)

{

	free_kstat_irqs(old_desc, desc);

	free_desc_masks(old_desc, desc);

	arch_free_chip_data(old_desc, desc);

}