Commit 19cfe912 authored Jul 20, 2017 by Jeffy Chen Committed by Marcel Holtmann Jul 24, 2017

Bluetooth: btusb: Fix memory leak in play_deferred



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>
Reviewed-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent d98422cb

drivers/bluetooth/btusb.c

+17 −2

Original line number	Diff line number	Diff line
		@@ -3271,13 +3271,28 @@ 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)
		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);
		usb_free_urb(urb);
		break;
		}

		data->tx_in_flight++;
		usb_free_urb(urb);
		}

		/* Cleanup the rest deferred urbs. */
		while ((urb = usb_get_from_anchor(&data->deferred))) {
		kfree(urb->setup_packet);
		usb_free_urb(urb);
		}
		usb_scuttle_anchored_urbs(&data->deferred);
		}

		static int btusb_resume(struct usb_interface *intf)

Admin message