On Thursday, December 19, 2013 11:22:22 AM Bjorn Helgaas wrote:
> On Thu, Dec 19, 2013 at 5:38 AM, Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx>
>
> Rafael, if you want to take these through your tree, feel free.
I'm going to do that, thanks!
> I'm guessing it probably makes sense to keep the whole series together.
Agreed.
> > ---
> > 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-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
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
