From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: xiyou.wangcong@gmail.com, briannorris@chromium.org,
dianders@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>
Subject: [RFC PATCH v2] Bluetooth: btusb: Fix memory leak in play_deferred
Date: Tue, 18 Jul 2017 10:05:10 +0800 [thread overview]
Message-ID: <1500343510-9623-1-git-send-email-jeffy.chen@rock-chips.com> (raw)
Currently we are calling usb_submit_urb directly to submit deferred tx
urbs after unanchor them.
So the usb_giveback_urb_bh would failed to unref it in usb_unanchor_urb
and cause memory leak:
unreferenced object 0xffffffc0ce0fa400 (size 256):
...
backtrace:
[<ffffffc00034a9a8>] __save_stack_trace+0x48/0x6c
[<ffffffc00034b088>] create_object+0x138/0x254
[<ffffffc0009d5504>] kmemleak_alloc+0x58/0x8c
[<ffffffc000345f78>] __kmalloc+0x1d4/0x2a0
[<ffffffc0006765bc>] usb_alloc_urb+0x30/0x60
[<ffffffbffc128598>] alloc_ctrl_urb+0x38/0x120 [btusb]
[<ffffffbffc129e7c>] btusb_send_frame+0x64/0xf8 [btusb]
Free those urbs after completed to avoid the leak, and also fix the
error handling.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v2:
Call usb_free_urb instead of reusing submit_tx_urb.
drivers/bluetooth/btusb.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 0d533b2..a22a08b 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3260,19 +3260,33 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
return 0;
}
+static void btusb_deferred_tx_complete(struct urb *urb)
+{
+ btusb_tx_complete(urb);
+ usb_free_urb(urb);
+}
+
static void play_deferred(struct btusb_data *data)
{
struct urb *urb;
int err;
while ((urb = usb_get_from_anchor(&data->deferred))) {
+ /* Add a hook to free urb after completed */
+ urb->complete = btusb_deferred_tx_complete;
+
err = usb_submit_urb(urb, GFP_ATOMIC);
- if (err < 0)
- break;
+ if (err < 0) {
+ if (err != -EPERM && err != -ENODEV)
+ BT_ERR("%s urb %p submission failed (%d)",
+ data->hdev->name, urb, -err);
+ kfree(urb->setup_packet);
+ usb_free_urb(urb);
+ continue;
+ }
data->tx_in_flight++;
}
- usb_scuttle_anchored_urbs(&data->deferred);
}
static int btusb_resume(struct usb_interface *intf)
--
2.1.4
next reply other threads:[~2017-07-18 2:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 2:05 Jeffy Chen [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-07-18 2:06 [RFC PATCH v2] Bluetooth: btusb: Fix memory leak in play_deferred Jeffy Chen
2017-07-18 6:44 ` Marcel Holtmann
2017-07-18 7:30 ` Oliver Neukum
2017-07-18 8:08 ` jeffy
2017-07-18 8:41 ` Oliver Neukum
2017-07-18 9:36 ` jeffy
2017-07-18 9:41 ` Oliver Neukum
2017-07-18 9:56 ` jeffy
2017-07-18 12:29 ` Oliver Neukum
2017-07-18 13:13 ` jeffy
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=1500343510-9623-1-git-send-email-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=briannorris@chromium.org \
--cc=dianders@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).