From: Bjorn Helgaas <helgaas@kernel.org>
To: Colin King <colin.king@canonical.com>
Cc: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI: acpiphp_ibm: fix null dereferences on null ibm_slot
Date: Fri, 8 Jan 2016 12:14:42 -0600 [thread overview]
Message-ID: <20160108181442.GE5354@localhost> (raw)
In-Reply-To: <1451694421-5277-1-git-send-email-colin.king@canonical.com>
On Sat, Jan 02, 2016 at 12:27:01AM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> ibm_slot_from_id can return null if the des header signature is
> not aPCI or if the kmalloc for the return acpi descriptore fails,
> causing potential null pointer dereferences on the return null
> descriptor.
>
> Handle the null case with appropriate check and error return.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied to pci/hotplug for v4.5, thanks, Colin!
> ---
> drivers/pci/hotplug/acpiphp_ibm.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
> index 6ca2399..9d16c9d 100644
> --- a/drivers/pci/hotplug/acpiphp_ibm.c
> +++ b/drivers/pci/hotplug/acpiphp_ibm.c
> @@ -154,7 +154,8 @@ static union apci_descriptor *ibm_slot_from_id(int id)
> ibm_slot_done:
> if (ret) {
> ret = kmalloc(sizeof(union apci_descriptor), GFP_KERNEL);
> - memcpy(ret, des, sizeof(union apci_descriptor));
> + if (ret)
> + memcpy(ret, des, sizeof(union apci_descriptor));
> }
> kfree(table);
> return ret;
> @@ -175,8 +176,13 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
> acpi_status stat;
> unsigned long long rc;
> union apci_descriptor *ibm_slot;
> + int id = hpslot_to_sun(slot);
>
> - ibm_slot = ibm_slot_from_id(hpslot_to_sun(slot));
> + ibm_slot = ibm_slot_from_id(id);
> + if (!ibm_slot) {
> + pr_err("APLS null ACPI descriptor for slot %d\n", id);
> + return -ENODEV;
> + }
>
> pr_debug("%s: set slot %d (%d) attention status to %d\n", __func__,
> ibm_slot->slot.slot_num, ibm_slot->slot.slot_id,
> @@ -215,8 +221,13 @@ static int ibm_set_attention_status(struct hotplug_slot *slot, u8 status)
> static int ibm_get_attention_status(struct hotplug_slot *slot, u8 *status)
> {
> union apci_descriptor *ibm_slot;
> + int id = hpslot_to_sun(slot);
>
> - ibm_slot = ibm_slot_from_id(hpslot_to_sun(slot));
> + ibm_slot = ibm_slot_from_id(id);
> + if (!ibm_slot) {
> + pr_err("APLS null ACPI descriptor for slot %d\n", id);
> + return -ENODEV;
> + }
>
> if (ibm_slot->slot.attn & 0xa0 || ibm_slot->slot.status[1] & 0x08)
> *status = 1;
> --
> 2.6.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2016-01-08 18:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-02 0:27 [PATCH] PCI: acpiphp_ibm: fix null dereferences on null ibm_slot Colin King
2016-01-08 18:14 ` Bjorn Helgaas [this message]
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=20160108181442.GE5354@localhost \
--to=helgaas@kernel.org \
--cc=bhelgaas@google.com \
--cc=colin.king@canonical.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
/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).