patch "xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable()" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable()
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
84ed91526f9881886d70a082032236edaa20e7d4Mon Sep 17 00:00:00 2001
From: Mika Westerberg <[email protected]>
Date: Fri, 4 Dec 2015 15:53:42 +0200
Subject: 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.
--- drivers/usb/host/xhci-pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-pci.c +6 -2
@@ -188,10 +188,14 @@ 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) { } +static void xhci_pme_acpi_rtd3_enable (struct pci_dev *dev) { }#endif /* CONFIG_ACPI */ /* called during probe() after chip reset completes */
Signature · 1 line
2.6.2