2022-03-28 11:21:21

by Xiaomeng Tong

Subject: [PATCH] aspeed-vhub: epn: fix an incorrect member check on list iterator

The bug is here:
if (&req->req == u_req) {

The list iterator 'req' will point to a bogus position containing
HEAD if the list is empty or no element is found. This case must
be checked before any use of the iterator, otherwise it may bypass
the 'if (&req->req == u_req) {' check in theory, if '*u_req' obj is
just allocated in the same addr with '&req->req'.

To fix this bug, just mova all thing inside the loop and return 0,
otherwise return error.

Cc: [email protected]
Fixes: 7ecca2a4080cb ("usb/gadget: Add driver for Aspeed SoC virtual hub")
Signed-off-by: Xiaomeng Tong <[email protected]>
---
drivers/usb/gadget/udc/aspeed-vhub/epn.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/epn.c b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
index 917892ca8753..aae4ce3e1029 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/epn.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/epn.c
@@ -468,27 +468,24 @@ static int ast_vhub_epn_dequeue(struct usb_ep* u_ep, struct usb_request *u_req)
struct ast_vhub *vhub = ep->vhub;
struct ast_vhub_req *req;
unsigned long flags;
- int rc = -EINVAL;

spin_lock_irqsave(&vhub->lock, flags);

/* Make sure it's actually queued on this endpoint */
list_for_each_entry (req, &ep->queue, queue) {
- if (&req->req == u_req)
- break;
- }
-
- if (&req->req == u_req) {
- EPVDBG(ep, "dequeue req @%p active=%d\n",
- req, req->active);
- if (req->active)
- ast_vhub_stop_active_req(ep, true);
- ast_vhub_done(ep, req, -ECONNRESET);
- rc = 0;
+ if (&req->req == u_req) {
+ EPVDBG(ep, "dequeue req @%p active=%d\n",
+ req, req->active);
+ if (req->active)
+ ast_vhub_stop_active_req(ep, true);
+ ast_vhub_done(ep, req, -ECONNRESET);
+ spin_unlock_irqrestore(&vhub->lock, flags);
+ return 0;
+ }
}

spin_unlock_irqrestore(&vhub->lock, flags);
- return rc;
+ return -EINVAL;
}

void ast_vhub_update_epn_stall(struct ast_vhub_ep *ep)
--
2.17.1

2022-04-22 20:07:01

by Greg Kroah-Hartman

Subject: Re: [PATCH] aspeed-vhub: epn: fix an incorrect member check on list iterator

On Sun, Mar 27, 2022 at 02:24:31PM +0800, Xiaomeng Tong wrote:
> The bug is here:
> if (&req->req == u_req) {
>
> The list iterator 'req' will point to a bogus position containing
> HEAD if the list is empty or no element is found. This case must
> be checked before any use of the iterator, otherwise it may bypass
> the 'if (&req->req == u_req) {' check in theory, if '*u_req' obj is
> just allocated in the same addr with '&req->req'.
>
> To fix this bug, just mova all thing inside the loop and return 0,
> otherwise return error.
>
> Cc: [email protected]
> Fixes: 7ecca2a4080cb ("usb/gadget: Add driver for Aspeed SoC virtual hub")
> Signed-off-by: Xiaomeng Tong <[email protected]>
> ---
> drivers/usb/gadget/udc/aspeed-vhub/epn.c | 23 ++++++++++-------------
> 1 file changed, 10 insertions(+), 13 deletions(-)

Does not apply anymore :(