* [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
@ 2012-10-09 7:37 Aaron Lu
2012-10-11 7:57 ` Aaron Lu
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Aaron Lu @ 2012-10-09 7:37 UTC (permalink / raw)
To: Jeff Garzik, Dan van der Ster; +Cc: linux-ide, linux-acpi
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@vanderster.com>
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Cc: <stable@vger.kernel.org>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
2012-10-09 7:37 [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle Aaron Lu
@ 2012-10-11 7:57 ` Aaron Lu
2012-10-11 8:27 ` Dan van der Ster
2012-11-16 4:22 ` Jeff Garzik
2 siblings, 0 replies; 5+ messages in thread
From: Aaron Lu @ 2012-10-11 7:57 UTC (permalink / raw)
To: Dan van der Ster; +Cc: Jeff Garzik, linux-ide, linux-acpi
Hi Dan,
It would be good if you can give this patch a Tested-by tag, thanks.
-Aaron
On 10/09/2012 03:37 PM, Aaron Lu 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@vanderster.com>
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>
> Cc: <stable@vger.kernel.org>
> ---
> 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);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
2012-10-09 7:37 [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle Aaron Lu
2012-10-11 7:57 ` Aaron Lu
@ 2012-10-11 8:27 ` Dan van der Ster
2012-11-16 3:40 ` Simple Simon
2012-11-16 4:22 ` Jeff Garzik
2 siblings, 1 reply; 5+ messages in thread
From: Dan van der Ster @ 2012-10-11 8:27 UTC (permalink / raw)
To: Aaron Lu; +Cc: Jeff Garzik, linux-ide, linux-acpi
On Tue, Oct 9, 2012 at 9:37 AM, Aaron Lu <aaron.lu@intel.com> 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@vanderster.com>
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>
> Cc: <stable@vger.kernel.org>
Tested-by: Dan van der Ster <dan@vanderster.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
2012-10-11 8:27 ` Dan van der Ster
@ 2012-11-16 3:40 ` Simple Simon
0 siblings, 0 replies; 5+ messages in thread
From: Simple Simon @ 2012-11-16 3:40 UTC (permalink / raw)
Cc: Aaron Lu, Jeff Garzik, linux-ide, linux-acpi
On 2012-10-11 08:27, Dan van der Ster wrote:
> On Tue, Oct 9, 2012 at 9:37 AM, Aaron Lu <aaron.lu@intel.com> 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@vanderster.com>
>> Signed-off-by: Aaron Lu <aaron.lu@intel.com>
>> Cc: <stable@vger.kernel.org>
> Tested-by: Dan van der Ster <dan@vanderster.com>
Tested-by: Simon <tangouniform@sbcglobal.net>
There's a third successful patch test report attached to the bugzilla
entry (link above) 10 days ago.
I ran into this, with 3.6.6 failing to boot, I think because of an
esata-attached enclosure w/ port multiplier.
>> ---
>> 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
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
2012-10-09 7:37 [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle Aaron Lu
2012-10-11 7:57 ` Aaron Lu
2012-10-11 8:27 ` Dan van der Ster
@ 2012-11-16 4:22 ` Jeff Garzik
2 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2012-11-16 4:22 UTC (permalink / raw)
To: Aaron Lu; +Cc: Dan van der Ster, linux-ide, linux-acpi
On 10/09/2012 03:37 AM, Aaron Lu 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@vanderster.com>
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>
> Cc: <stable@vger.kernel.org>
> ---
> drivers/ata/libata-acpi.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
applied, with added Tested-by labels
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-16 4:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-09 7:37 [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle Aaron Lu
2012-10-11 7:57 ` Aaron Lu
2012-10-11 8:27 ` Dan van der Ster
2012-11-16 3:40 ` Simple Simon
2012-11-16 4:22 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).