Unverified Commit 9a1c3b15 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15442 nfc: nfcmrvl: Fix memory leak in nfcmrvl_play_deferred 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/EMFWWHI345L3KD2YFZX7C65WT47GYHPB/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP6U3 
 
Link:https://gitee.com/openeuler/kernel/pulls/15442

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 2c4ba44a 5465fc4d

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)