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

Commit 121621e7 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman
Browse files

usb: gadget: composite: fix delayed_status race condition when set_interface 



[ Upstream commit 980900d6318066b9f8314bfb87329a20fd0d1ca4 ]

It happens when enable debug log, if set_alt() returns
USB_GADGET_DELAYED_STATUS and usb_composite_setup_continue()
is called before increasing count of @delayed_status,
so fix it by using spinlock of @cdev->lock.

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Tested-by: default avatarJay Hsu <shih-chieh.hsu@mediatek.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77569fc2

drivers/usb/gadget/composite.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1712,6 +1712,8 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
		 */

		 */

		if (w_value && !f->get_alt)

		if (w_value && !f->get_alt)

			break;

			break;



		spin_lock(&cdev->lock);

		value = f->set_alt(f, w_index, w_value);

		value = f->set_alt(f, w_index, w_value);

		if (value == USB_GADGET_DELAYED_STATUS) {

		if (value == USB_GADGET_DELAYED_STATUS) {

			DBG(cdev,

			DBG(cdev,
@@ -1721,6 +1723,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			DBG(cdev, "delayed_status count %d\n",

			DBG(cdev, "delayed_status count %d\n",

					cdev->delayed_status);

					cdev->delayed_status);

		}

		}

		spin_unlock(&cdev->lock);

		break;

		break;

	case USB_REQ_GET_INTERFACE:

	case USB_REQ_GET_INTERFACE:

		if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))

		if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))