Skip to content

Commit

Permalink
ahci: fix Null pointer dereference in achi_host_active()
Browse files Browse the repository at this point in the history
commit b29900e (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.

changes in v2: use pp to check dummy ports, update comments

Reported-and-tested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Xiaotian Feng <xtfeng@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Alexander Gordeev <agordeev@redhat.com>
Cc: linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
  • Loading branch information
Xiaotian Feng authored and Tejun Heo committed Jul 23, 2013
1 parent bb96961 commit c91bc6c
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/ata/ahci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1146,11 +1146,18 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis)
return rc;

for (i = 0; i < host->n_ports; i++) {
const char* desc;
struct ahci_port_priv *pp = host->ports[i]->private_data;

/* pp is NULL for dummy ports */
if (pp)
desc = pp->irq_desc;
else
desc = dev_driver_string(host->dev);

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;
}
Expand Down

0 comments on commit c91bc6c

Please sign in to comment.