usb: gadget: goku_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: Jakob Koschel <jakobkoschel@gmail.com> Link: https://lore.kernel.org/r/20220308171818.384491-7-jakobkoschel@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
2390ea9c07
Коммит
7336cccf04
|
@ -809,7 +809,7 @@ static void nuke(struct goku_ep *ep, int status)
|
||||||
/* dequeue JUST ONE request */
|
/* dequeue JUST ONE request */
|
||||||
static int goku_dequeue(struct usb_ep *_ep, struct usb_request *_req)
|
static int goku_dequeue(struct usb_ep *_ep, struct usb_request *_req)
|
||||||
{
|
{
|
||||||
struct goku_request *req;
|
struct goku_request *req = NULL, *iter;
|
||||||
struct goku_ep *ep;
|
struct goku_ep *ep;
|
||||||
struct goku_udc *dev;
|
struct goku_udc *dev;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -833,11 +833,13 @@ static int goku_dequeue(struct usb_ep *_ep, struct usb_request *_req)
|
||||||
spin_lock_irqsave(&dev->lock, flags);
|
spin_lock_irqsave(&dev->lock, flags);
|
||||||
|
|
||||||
/* make sure it's actually queued on this endpoint */
|
/* make sure it's actually queued on this endpoint */
|
||||||
list_for_each_entry (req, &ep->queue, queue) {
|
list_for_each_entry(iter, &ep->queue, queue) {
|
||||||
if (&req->req == _req)
|
if (&iter->req != _req)
|
||||||
break;
|
continue;
|
||||||
|
req = iter;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (&req->req != _req) {
|
if (!req) {
|
||||||
spin_unlock_irqrestore (&dev->lock, flags);
|
spin_unlock_irqrestore (&dev->lock, flags);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче