Commit-ID:  143d36a33b4d59a56bb8e913a17a105578fd3237
Gitweb:     http://git.kernel.org/tip/143d36a33b4d59a56bb8e913a17a105578fd3237
Author:     Dan Carpenter <dan.carpen...@oracle.com>
AuthorDate: Fri, 11 Mar 2016 11:14:43 +0300
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Fri, 11 Mar 2016 10:06:55 +0100

irqchip/irq-alpine-msi: Release the correct domain on error

The "msi_domain" variable is NULL here so it leads to a NULL dereference.  It
looks like we actually intended to free "middle_domain".

Fixes: e6b78f2c3e14 ('irqchip: Add the Alpine MSIX interrupt controller')
Signed-off-by: Dan Carpenter <dan.carpen...@oracle.com>
Cc: Jason Cooper <ja...@lakedaemon.net>
Cc: Marc Zyngier <marc.zyng...@arm.com>
Cc: Antoine Tenart <antoine.ten...@free-electrons.com>
Cc: kernel-janit...@vger.kernel.org
Cc: Tsahee Zidenberg <tsa...@annapurnalabs.com>
Link: http://lkml.kernel.org/r/20160311081442.GE31887@mwanda
Signed-off-by: Thomas Gleixner <t...@linutronix.de>

---
 drivers/irqchip/irq-alpine-msi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c
index f871272..2538425 100644
--- a/drivers/irqchip/irq-alpine-msi.c
+++ b/drivers/irqchip/irq-alpine-msi.c
@@ -220,7 +220,7 @@ static int alpine_msix_init_domains(struct alpine_msix_data 
*priv,
                                               middle_domain);
        if (!msi_domain) {
                pr_err("Failed to create MSI domain\n");
-               irq_domain_remove(msi_domain);
+               irq_domain_remove(middle_domain);
                return -ENOMEM;
        }
 

Reply via email to