On Tue, Oct 9, 2012 at 9:37 AM, Aaron Lu <aaron.lu@xxxxxxxxx> wrote: > commit 6b66d95895c149cbc04d4fac5a2f5477c543a8ae didn't handle SATA PMP > case in ata_acpi_bind_device and will cause a NULL ptr dereference when > user attached a SATA drive to the PMP port. Fix this by checking PMP > support. > > This bug is reported by Dan van der Ster in the following bugzilla page: > https://bugzilla.kernel.org/show_bug.cgi?id=48211 > > Reported-by: Dan van der Ster <dan@xxxxxxxxxxxxxx> > Signed-off-by: Aaron Lu <aaron.lu@xxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> Tested-by: Dan van der Ster <dan@xxxxxxxxxxxxxx> > --- > drivers/ata/libata-acpi.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c > index fd9ecf7..5b0ba3f 100644 > --- a/drivers/ata/libata-acpi.c > +++ b/drivers/ata/libata-acpi.c > @@ -1105,10 +1105,15 @@ static int ata_acpi_bind_device(struct ata_port *ap, struct scsi_device *sdev, > struct acpi_device *acpi_dev; > struct acpi_device_power_state *states; > > - if (ap->flags & ATA_FLAG_ACPI_SATA) > - ata_dev = &ap->link.device[sdev->channel]; > - else > + if (ap->flags & ATA_FLAG_ACPI_SATA) { > + if (!sata_pmp_attached(ap)) > + ata_dev = &ap->link.device[sdev->id]; > + else > + ata_dev = &ap->pmp_link[sdev->channel].device[sdev->id]; > + } > + else { > ata_dev = &ap->link.device[sdev->id]; > + } > > *handle = ata_dev_acpi_handle(ata_dev); > > -- > 1.7.12.21.g871e293 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
