Commit d5d0b280 authored by Jakob Koschel's avatar Jakob Koschel Committed by Greg Kroah-Hartman
Browse files

usb: gadget: omap_udc: remove usage of list iterator past the loop body 

If the list representing the request queue does not contain the expected
request, the value of the list_for_each_entry() iterator will not point
to a valid structure. To avoid type confusion in such case, the list
iterator scope will be limited to the list_for_each_entry() loop.

In preparation to limiting scope of the list iterator to the list traversal
loop, use a dedicated pointer to point to the found request object [1].

Link: https://lore.kernel.org/all/YhdfEIwI4EdtHdym@kroah.com/


Signed-off-by: default avatarJakob Koschel <jakobkoschel@gmail.com>
Link: https://lore.kernel.org/r/20220308171818.384491-14-jakobkoschel@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6f8cc55

drivers/usb/gadget/udc/omap_udc.c

+7 −5
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) 
static int omap_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)

{

	struct omap_ep	*ep = container_of(_ep, struct omap_ep, ep);

	struct omap_req	*req;

	struct omap_req	*req = NULL, *iter;

	unsigned long	flags;



	if (!_ep || !_req)
@@ -1012,11 +1012,13 @@ static int omap_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) 
	spin_lock_irqsave(&ep->udc->lock, flags);



	/* make sure it's actually queued on this endpoint */

	list_for_each_entry(req, &ep->queue, queue) {

		if (&req->req == _req)

	list_for_each_entry(iter, &ep->queue, queue) {

		if (&iter->req != _req)

			continue;

		req = iter;

		break;

	}

	if (&req->req != _req) {

	if (!req) {

		spin_unlock_irqrestore(&ep->udc->lock, flags);

		return -EINVAL;

	}