* [PATCH v3] Bluetooth: btusb: Fix memory leak in play_deferred
@ 2017-07-18 6:34 Jeffy Chen
2017-07-18 6:45 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: Jeffy Chen @ 2017-07-18 6:34 UTC (permalink / raw)
To: linux-kernel
Cc: xiyou.wangcong, briannorris, dianders, Jeffy Chen, Johan Hedberg,
Marcel Holtmann, Gustavo Padovan, linux-bluetooth
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]
Put those urbs in tx_anchor to avoid the leak, and also fix the error
handling.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v3:
Put the deferred urbs in tx_anchor.
Changes in v2:
Call usb_free_urb instead of reusing submit_tx_urb.
drivers/bluetooth/btusb.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 0d533b2..9af679c 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3266,13 +3266,21 @@ static void play_deferred(struct btusb_data *data)
int err;
while ((urb = usb_get_from_anchor(&data->deferred))) {
+ usb_anchor_urb(urb, &data->tx_anchor);
+
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_unanchor_urb(urb);
+ } else {
+ data->tx_in_flight++;
+ }
- data->tx_in_flight++;
+ usb_free_urb(urb);
}
- usb_scuttle_anchored_urbs(&data->deferred);
}
static int btusb_resume(struct usb_interface *intf)
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] Bluetooth: btusb: Fix memory leak in play_deferred
2017-07-18 6:34 [PATCH v3] Bluetooth: btusb: Fix memory leak in play_deferred Jeffy Chen
@ 2017-07-18 6:45 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2017-07-18 6:45 UTC (permalink / raw)
To: Jeffy Chen, Oliver Neukum
Cc: linux-kernel, xiyou.wangcong, briannorris, dianders,
Johan Hedberg, Gustavo F. Padovan, linux-bluetooth
Hi Oliver,
> 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]
>
> Put those urbs in tx_anchor to avoid the leak, and also fix the error
> handling.
>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
> ---
>
> Changes in v3:
> Put the deferred urbs in tx_anchor.
>
> Changes in v2:
> Call usb_free_urb instead of reusing submit_tx_urb.
>
> drivers/bluetooth/btusb.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 0d533b2..9af679c 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -3266,13 +3266,21 @@ static void play_deferred(struct btusb_data *data)
> int err;
>
> while ((urb = usb_get_from_anchor(&data->deferred))) {
> + usb_anchor_urb(urb, &data->tx_anchor);
> +
> 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_unanchor_urb(urb);
> + } else {
> + data->tx_in_flight++;
> + }
>
> - data->tx_in_flight++;
> + usb_free_urb(urb);
> }
> - usb_scuttle_anchored_urbs(&data->deferred);
> }
>
or maybe an ack for this version?
Regards
Marcel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-18 6:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-18 6:34 [PATCH v3] Bluetooth: btusb: Fix memory leak in play_deferred Jeffy Chen
2017-07-18 6:45 ` Marcel Holtmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.