From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752060Ab3GQGKy (ORCPT ); Wed, 17 Jul 2013 02:10:54 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:45696 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341Ab3GQGKw (ORCPT ); Wed, 17 Jul 2013 02:10:52 -0400 From: Xiaotian Feng Cc: Xiaotian Feng , Alexander Gordeev , Tejun Heo , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] AHCI: fix Null pointer dereference in achi_host_active() Date: Wed, 17 Jul 2013 14:10:39 +0800 Message-Id: <1374041439-34122-1-git-send-email-xtfeng@gmail.com> X-Mailer: git-send-email 1.7.9.6 (Apple Git-31.1) In-Reply-To: <51E53300.6010000@cogentembedded.com> References: <51E53300.6010000@cogentembedded.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit b29900e6 (AHCI: Make distinct names for ports in /proc/interrupts) introuded a regression, which resulted Null pointer dereference for achi host with dummy ports. For ahci ports, when the port is dummy port, its private_data will be NULL, as ata_dummy_port_ops doesn't support ->port_start. Reported-and-tested-by: Alex Williamson Signed-off-by: Xiaotian Feng Cc: Alexander Gordeev Cc: Tejun Heo Cc: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/ata/ahci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5064f3e..f1de689 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1147,10 +1147,16 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis) for (i = 0; i < host->n_ports; i++) { struct ahci_port_priv *pp = host->ports[i]->private_data; + const char *desc; + if (ata_port_is_dummy(host->ports[i])) + desc = dev_driver_string(host->dev); + else + desc = pp->irq_desc; + rc = devm_request_threaded_irq(host->dev, irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED, - pp->irq_desc, host->ports[i]); + desc, host->ports[i]); if (rc) goto out_free_irqs; } -- 1.7.9.6 (Apple Git-31.1)