Commit 07437ac5 authored Mar 08, 2022 by Jakob Koschel Committed by Greg Kroah-Hartman Mar 15, 2022

usb: gadget: udc: pxa25x: 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: Jakob Koschel <jakobkoschel@gmail.com>
Link: https://lore.kernel.org/r/20220308171818.384491-5-jakobkoschel@gmail.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 109122f3

drivers/usb/gadget/udc/pxa25x_udc.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -966,7 +966,8 @@ static void nuke(struct pxa25x_ep *ep, int status)
		static int pxa25x_ep_dequeue(struct usb_ep _ep, struct usb_request _req)
		{
		struct pxa25x_ep *ep;
		struct pxa25x_request *req;
		struct pxa25x_request *req = NULL;
		struct pxa25x_request *iter;
		unsigned long flags;

		ep = container_of(_ep, struct pxa25x_ep, ep);
		@@ -976,11 +977,13 @@ static int pxa25x_ep_dequeue(struct usb_ep _ep, struct usb_request _req)
		local_irq_save(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) {
		local_irq_restore(flags);
		return -EINVAL;
		}