Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de8bb6f9 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: composite: Fix double free memory bug" into msm-4.8

parents 2ca83afc de9c2225

drivers/usb/gadget/composite.c

+4 −0
Original line number Diff line number Diff line
@@ -2166,14 +2166,18 @@ void composite_dev_cleanup(struct usb_composite_dev *cdev) 
			usb_ep_dequeue(cdev->gadget->ep0, cdev->os_desc_req);



		kfree(cdev->os_desc_req->buf);

		cdev->os_desc_req->buf = NULL;

		usb_ep_free_request(cdev->gadget->ep0, cdev->os_desc_req);

		cdev->os_desc_req = NULL;

	}

	if (cdev->req) {

		if (cdev->setup_pending)

			usb_ep_dequeue(cdev->gadget->ep0, cdev->req);



		kfree(cdev->req->buf);

		cdev->req->buf = NULL;

		usb_ep_free_request(cdev->gadget->ep0, cdev->req);

		cdev->req = NULL;

	}

	cdev->next_string_id = 0;

	device_remove_file(&cdev->gadget->dev, &dev_attr_suspended);