From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758855AbcIMPEy (ORCPT ); Tue, 13 Sep 2016 11:04:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41830 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754132AbcIMPEv (ORCPT ); Tue, 13 Sep 2016 11:04:51 -0400 Date: Tue, 13 Sep 2016 08:04:29 -0700 From: tip-bot for Boris Brezillon Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, nicolas.ferre@atmel.com, jason@lakedaemon.net, tglx@linutronix.de, marc.zyngier@arm.com, mingo@kernel.org, boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com Reply-To: boris.brezillon@free-electrons.com, alexandre.belloni@free-electrons.com, jason@lakedaemon.net, mingo@kernel.org, marc.zyngier@arm.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, nicolas.ferre@atmel.com, hpa@zytor.com In-Reply-To: <1473775109-4192-2-git-send-email-boris.brezillon@free-electrons.com> References: <1473775109-4192-2-git-send-email-boris.brezillon@free-electrons.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/atmel-aic: Fix potential deadlock in ->xlate() Git-Commit-ID: 5eb0d6eb3fac3daa60d9190eed9fa41cf809c756 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5eb0d6eb3fac3daa60d9190eed9fa41cf809c756 Gitweb: http://git.kernel.org/tip/5eb0d6eb3fac3daa60d9190eed9fa41cf809c756 Author: Boris Brezillon AuthorDate: Tue, 13 Sep 2016 15:58:29 +0200 Committer: Thomas Gleixner CommitDate: Tue, 13 Sep 2016 16:57:40 +0200 irqchip/atmel-aic: Fix potential deadlock in ->xlate() aic5_irq_domain_xlate() and aic_irq_domain_xlate() take the generic chip lock without disabling interrupts, which can lead to a deadlock if an interrupt occurs while the lock is held in one of these functions. Replace irq_gc_{lock,unlock}() calls by irq_gc_{lock_irqsave,unlock_irqrestore}() ones to prevent this bug from happening. Fixes: b1479ebb7720 ("irqchip: atmel-aic: Add atmel AIC/AIC5 drivers") Signed-off-by: Boris Brezillon Acked-by: Marc Zyngier Cc: Jason Cooper Cc: Nicolas Ferre Cc: stable@vger.kernel.org Cc: Alexandre Belloni Link: http://lkml.kernel.org/r/1473775109-4192-2-git-send-email-boris.brezillon@free-electrons.com Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-atmel-aic.c | 5 +++-- drivers/irqchip/irq-atmel-aic5.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c index 112e17c..37f952d 100644 --- a/drivers/irqchip/irq-atmel-aic.c +++ b/drivers/irqchip/irq-atmel-aic.c @@ -176,6 +176,7 @@ static int aic_irq_domain_xlate(struct irq_domain *d, { struct irq_domain_chip_generic *dgc = d->gc; struct irq_chip_generic *gc; + unsigned long flags; unsigned smr; int idx; int ret; @@ -194,11 +195,11 @@ static int aic_irq_domain_xlate(struct irq_domain *d, gc = dgc->gc[idx]; - irq_gc_lock(gc); + irq_gc_lock_irqsave(gc, flags); smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq)); aic_common_set_priority(intspec[2], &smr); irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); - irq_gc_unlock(gc); + irq_gc_unlock_irqrestore(gc, flags); return ret; } diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c index 4f0d068..2a624d8 100644 --- a/drivers/irqchip/irq-atmel-aic5.c +++ b/drivers/irqchip/irq-atmel-aic5.c @@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, unsigned int *out_type) { struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0); + unsigned long flags; unsigned smr; int ret; @@ -269,12 +270,12 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, if (ret) return ret; - irq_gc_lock(bgc); + irq_gc_lock_irqsave(bgc, flags); irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR); smr = irq_reg_readl(bgc, AT91_AIC5_SMR); aic_common_set_priority(intspec[2], &smr); irq_reg_writel(bgc, smr, AT91_AIC5_SMR); - irq_gc_unlock(bgc); + irq_gc_unlock_irqrestore(bgc, flags); return ret; }