Commit de71a6cb authored by Jupeng Zhong's avatar Jupeng Zhong Committed by Marcel Holtmann
Browse files

Bluetooth: btusb: Fix memory leak in btusb_mtk_wmt_recv 



In btusb_mtk_wmt_recv if skb_clone fails, the alocated skb should be
released.

Omit the labels “err_out” and “err_free_skb” in this function
implementation so that the desired exception handling code
would be directly specified in the affected if branches.

Fixes: a1c49c43 ("btusb: Add protocol support for MediaTek MT7668U USB devices")
Signed-off-by: default avatarJupeng Zhong <zhongjupeng@yulong.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e8bd76ed

drivers/bluetooth/btusb.c

+10 −10
Original line number Diff line number Diff line
@@ -3241,7 +3241,7 @@ static void btusb_mtk_wmt_recv(struct urb *urb) 
		skb = bt_skb_alloc(HCI_WMT_MAX_EVENT_SIZE, GFP_ATOMIC);

		if (!skb) {

			hdev->stat.err_rx++;

			goto err_out;

			return;

		}



		hci_skb_pkt_type(skb) = HCI_EVENT_PKT;
@@ -3259,13 +3259,18 @@ static void btusb_mtk_wmt_recv(struct urb *urb) 
		 */

		if (test_bit(BTUSB_TX_WAIT_VND_EVT, &data->flags)) {

			data->evt_skb = skb_clone(skb, GFP_ATOMIC);

			if (!data->evt_skb)

				goto err_out;

			if (!data->evt_skb) {

				kfree_skb(skb);

				return;

			}

		}



		err = hci_recv_frame(hdev, skb);

		if (err < 0)

			goto err_free_skb;

		if (err < 0) {

			kfree_skb(data->evt_skb);

			data->evt_skb = NULL;

			return;

		}



		if (test_and_clear_bit(BTUSB_TX_WAIT_VND_EVT,

				       &data->flags)) {
@@ -3274,11 +3279,6 @@ static void btusb_mtk_wmt_recv(struct urb *urb) 
			wake_up_bit(&data->flags,

				    BTUSB_TX_WAIT_VND_EVT);

		}

err_out:

		return;

err_free_skb:

		kfree_skb(data->evt_skb);

		data->evt_skb = NULL;

		return;

	} else if (urb->status == -ENOENT) {

		/* Avoid suspend failed when usb_kill_urb */