Commit 6b4d8b44 authored Jun 07, 2022 by Xiaohui Zhang Committed by Greg Kroah-Hartman Jun 22, 2022

nfc: nfcmrvl: Fix memory leak in nfcmrvl_play_deferred



[ Upstream commit 8a4d480702b71184fabcf379b80bf7539716752e ]

Similar to the handling of play_deferred in commit 19cfe912
("Bluetooth: btusb: Fix memory leak in play_deferred"), we thought
a patch might be needed here as well.

Currently usb_submit_urb is called 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.

Put those urbs in tx_anchor to avoid the leak, and also fix the error
handling.

Signed-off-by: Xiaohui Zhang <xiaohuizhang@ruc.edu.cn>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220607083230.6182-1-xiaohuizhang@ruc.edu.cn


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 786428a1

drivers/nfc/nfcmrvl/usb.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -401,13 +401,25 @@ static void nfcmrvl_play_deferred(struct nfcmrvl_usb_drv_data *drv_data)
		int err;

		while ((urb = usb_get_from_anchor(&drv_data->deferred))) {
		usb_anchor_urb(urb, &drv_data->tx_anchor);

		err = usb_submit_urb(urb, GFP_ATOMIC);
		if (err)
		if (err) {
		kfree(urb->setup_packet);
		usb_unanchor_urb(urb);
		usb_free_urb(urb);
		break;
		}

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

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

		static int nfcmrvl_resume(struct usb_interface *intf)