From: Aaron Lu <aaron.lu@intel.com>
To: Dan van der Ster <dan@vanderster.com>
Cc: Jeff Garzik <jgarzik@pobox.com>,
linux-ide@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: Re: [PATCH] libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
Date: Thu, 11 Oct 2012 15:57:52 +0800 [thread overview]
Message-ID: <50767C00.6070001@intel.com> (raw)
In-Reply-To: <5073D44C.7070101@intel.com>
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);
>
>
next prev parent reply other threads:[~2012-10-11 7:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-10-11 8:27 ` Dan van der Ster
2012-11-16 3:40 ` Simple Simon
2012-11-16 4:22 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50767C00.6070001@intel.com \
--to=aaron.lu@intel.com \
--cc=dan@vanderster.com \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).