Re: [PATCH] x86: check for valid irq_cfg pointer insmp_irq_move_cleanup_interrupt

[Dimitri Sivanich]

On Mon, May 21, 2012 at 11:07:04PM +0200, Thomas Gleixner wrote:
> On Mon, 21 May 2012, Dimitri Sivanich wrote:
> 
> > The smp_irq_move_cleanup_interrupt routine should be checking for a valid
> > irq_cfg pointer prior to accessing it.  It also seems that this should be
> > done after taking the desc lock.
> 
> It seems that you either missed or failed to explain why it should be
> done _after_ taking the lock.
> 
> Changelogs matter, really.
>
How about this?


The smp_irq_move_cleanup_interrupt routine should be checking for a valid
irq_cfg pointer prior to accessing it.

Follow the same protocol shown in irq_set_chip_data(), by taking the desc
lock before accessing this location.

Signed-off-by: Dimitri Sivanich <sivanich@xxxxxxx>
---
 arch/x86/kernel/apic/io_apic.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: linux/arch/x86/kernel/apic/io_apic.c
===================================================================
--- linux.orig/arch/x86/kernel/apic/io_apic.c
+++ linux/arch/x86/kernel/apic/io_apic.c
@@ -2478,9 +2478,12 @@ asmlinkage void smp_irq_move_cleanup_int
 		if (!desc)
 			continue;
 
-		cfg = irq_cfg(irq);
 		raw_spin_lock(&desc->lock);
 
+		cfg = irq_cfg(irq);
+		if (!cfg)
+			goto unlock;
+
 		/*
 		 * Check if the irq migration is in progress. If so, we
 		 * haven't received the cleanup request yet for this irq.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/