Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759261Ab2EUVTY (ORCPT ); Mon, 21 May 2012 17:19:24 -0400 Received: from relay1.sgi.com ([192.48.179.29]:57087 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759238Ab2EUVTV (ORCPT ); Mon, 21 May 2012 17:19:21 -0400 Date: Mon, 21 May 2012 16:19:17 -0500 From: Dimitri Sivanich To: Thomas Gleixner Cc: Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Suresh Siddha , Yinghai Lu , Naga Chumbalkar , Jacob Pan , linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86: check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt Message-ID: <20120521211917.GA25567@sgi.com> References: <20120521164959.GE16454@sgi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1617 Lines: 49 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 --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/