From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: mika.westerberg@linux.intel.com, mathias.nyman@linux.intel.com,
stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] xhci: Fix memory leak in xhci_add_in_port()" failed to apply to 4.14-stable tree
Date: Sun, 15 Dec 2019 12:47:11 -0500 [thread overview]
Message-ID: <20191215174711.GG18043@sasha-vm> (raw)
In-Reply-To: <157640192510189@kroah.com>
On Sun, Dec 15, 2019 at 10:25:25AM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From ce91f1a43b37463f517155bdfbd525eb43adbd1a Mon Sep 17 00:00:00 2001
>From: Mika Westerberg <mika.westerberg@linux.intel.com>
>Date: Wed, 11 Dec 2019 16:20:02 +0200
>Subject: [PATCH] xhci: Fix memory leak in xhci_add_in_port()
>
>When xHCI is part of Alpine or Titan Ridge Thunderbolt controller and
>the xHCI device is hot-removed as a result of unplugging a dock for
>example, the driver leaks memory it allocates for xhci->usb3_rhub.psi
>and xhci->usb2_rhub.psi in xhci_add_in_port() as reported by kmemleak:
>
>unreferenced object 0xffff922c24ef42f0 (size 16):
> comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s)
> hex dump (first 16 bytes):
> 21 00 0c 00 12 00 dc 05 23 00 e0 01 00 00 00 00 !.......#.......
> backtrace:
> [<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
> [<0000000001b6d775>] xhci_init+0x7c/0x160
> [<00000000db443fe3>] xhci_gen_setup+0x214/0x340
> [<00000000fdffd320>] xhci_pci_setup+0x48/0x110
> [<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
> [<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
> [<0000000021043861>] xhci_pci_probe+0x24/0x1c0
> [<00000000b9231f25>] local_pci_probe+0x3d/0x70
> [<000000006385c9d7>] pci_device_probe+0xd0/0x150
> [<0000000070241068>] really_probe+0xf5/0x3c0
> [<0000000061f35c0a>] driver_probe_device+0x58/0x100
> [<000000009da11198>] bus_for_each_drv+0x79/0xc0
> [<000000009ce45f69>] __device_attach+0xda/0x160
> [<00000000df201aaf>] pci_bus_add_device+0x46/0x70
> [<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
> [<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60
>unreferenced object 0xffff922c24ef3318 (size 8):
> comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s)
> hex dump (first 8 bytes):
> 34 01 05 00 35 41 0a 00 4...5A..
> backtrace:
> [<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
> [<0000000001b6d775>] xhci_init+0x7c/0x160
> [<00000000db443fe3>] xhci_gen_setup+0x214/0x340
> [<00000000fdffd320>] xhci_pci_setup+0x48/0x110
> [<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
> [<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
> [<0000000021043861>] xhci_pci_probe+0x24/0x1c0
> [<00000000b9231f25>] local_pci_probe+0x3d/0x70
> [<000000006385c9d7>] pci_device_probe+0xd0/0x150
> [<0000000070241068>] really_probe+0xf5/0x3c0
> [<0000000061f35c0a>] driver_probe_device+0x58/0x100
> [<000000009da11198>] bus_for_each_drv+0x79/0xc0
> [<000000009ce45f69>] __device_attach+0xda/0x160
> [<00000000df201aaf>] pci_bus_add_device+0x46/0x70
> [<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
> [<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60
>
>Fix this by calling kfree() for the both psi objects in
>xhci_mem_cleanup().
Context changes due to missing:
bcaa9d5c5900 ("xhci: Create new structures to store xhci port information")
Fixed up and queued up for 4.14 - 4.4.
--
Thanks,
Sasha
prev parent reply other threads:[~2019-12-15 17:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-15 9:25 FAILED: patch "[PATCH] xhci: Fix memory leak in xhci_add_in_port()" failed to apply to 4.14-stable tree gregkh
2019-12-15 17:47 ` Sasha Levin [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=20191215174711.GG18043@sasha-vm \
--to=sashal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=mathias.nyman@linux.intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=stable@vger.kernel.org \
/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