Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ed9152 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable() 



There is a memory leak because acpi_evaluate_dsm() actually returns an
object which the caller is supposed to release. Fix this by calling
ACPI_FREE() for the returned object (this expands to kfree() so passing
NULL there is fine as well).

While there correct indentation in !CONFIG_ACPI case.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Cc: stable <stable@vger.kernel.org> # v4.2
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5377adb0

drivers/usb/host/xhci-pci.c

+6 −2
Original line number Diff line number Diff line
@@ -188,7 +188,11 @@ static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) 
		0xb7, 0x0c, 0x34, 0xac,	0x01, 0xe9, 0xbf, 0x45,

		0xb7, 0xe6, 0x2b, 0x34, 0xec, 0x93, 0x1e, 0x23,

	};

	acpi_evaluate_dsm(ACPI_HANDLE(&dev->dev), intel_dsm_uuid, 3, 1, NULL);

	union acpi_object *obj;



	obj = acpi_evaluate_dsm(ACPI_HANDLE(&dev->dev), intel_dsm_uuid, 3, 1,

				NULL);

	ACPI_FREE(obj);

}

#else

static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }