linux-kernel - Re: [Patch v2 03/13] PCI, pci-label: release allocated ACPI object on error recovery path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 19 Dec 2013 11:22:22 -0700
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	Jiang Liu <jiang.liu@...ux.intel.com>
Cc:	"Rafael J . Wysocki" <rafael.j.wysocki@...el.com>,
	Lv Zheng <lv.zheng@...el.com>, Len Brown <lenb@...nel.org>,
	Tony Luck <tony.luck@...el.com>,
	"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>
Subject: Re: [Patch v2 03/13] PCI, pci-label: release allocated ACPI object on
 error recovery path

On Thu, Dec 19, 2013 at 5:38 AM, Jiang Liu <jiang.liu@...ux.intel.com> wrote:
> Function dsm_get_label() leaks the returned ACPI object if
> obj->package.count is not 2, so fix the possible memory leak.
>
> Signed-off-by: Jiang Liu <jiang.liu@...ux.intel.com>

Rafael, if you want to take these through your tree, feel free.  I'm
guessing it probably makes sense to keep the whole series together.

> ---
>  drivers/pci/pci-label.c |   12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
> index d51f45a..f6e01a5 100644
> --- a/drivers/pci/pci-label.c
> +++ b/drivers/pci/pci-label.c
> @@ -233,11 +233,7 @@ dsm_get_label(acpi_handle handle, int func,
>                 return -1;
>
>         obj = (union acpi_object *)output->pointer;
> -
> -       switch (obj->type) {
> -       case ACPI_TYPE_PACKAGE:
> -               if (obj->package.count != 2)
> -                       break;
> +       if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 2) {
>                 len = obj->package.elements[0].integer.value;
>                 if (buf) {
>                         if (attribute == ACPI_ATTR_INDEX_SHOW)
> @@ -250,10 +246,10 @@ dsm_get_label(acpi_handle handle, int func,
>                 }
>                 kfree(output->pointer);
>                 return len;
> -       break;
> -       default:
> -               kfree(output->pointer);
>         }
> +
> +       kfree(output->pointer);
> +
>         return -1;
>  }
>
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/