| Message ID | 20210906094221.GA10957@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 17956b53ebff6a490baf580a836cbd3eae94892b |
| Headers | show |
| Series | usb: gadget: r8a66597: fix a loop in set_feature() | expand |
Hi Dan, > From: Dan Carpenter, Sent: Monday, September 6, 2021 6:42 PM > > This loop is supposed to loop until if reads something other than > CS_IDST or until it times out after 30,000 attempts. But because of > the || vs && bug, it will never time out and instead it will loop a > minimum of 30,000 times. > > This bug is quite old but the code is only used in USB_DEVICE_TEST_MODE > so it probably doesn't affect regular usage. > > Fixes: 96fe53ef5498 ("usb: gadget: r8a66597-udc: add support for TEST_MODE") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thank you for the patch! Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
Dan Carpenter <dan.carpenter@oracle.com> writes: > This loop is supposed to loop until if reads something other than > CS_IDST or until it times out after 30,000 attempts. But because of > the || vs && bug, it will never time out and instead it will loop a > minimum of 30,000 times. > > This bug is quite old but the code is only used in USB_DEVICE_TEST_MODE > so it probably doesn't affect regular usage. > > Fixes: 96fe53ef5498 ("usb: gadget: r8a66597-udc: add support for TEST_MODE") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Felipe Balbi <balbi@kernel.org>
diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c index 65cae4883454..38e4d6b505a0 100644 --- a/drivers/usb/gadget/udc/r8a66597-udc.c +++ b/drivers/usb/gadget/udc/r8a66597-udc.c @@ -1250,7 +1250,7 @@ static void set_feature(struct r8a66597 *r8a66597, struct usb_ctrlrequest *ctrl) do { tmp = r8a66597_read(r8a66597, INTSTS0) & CTSQ; udelay(1); - } while (tmp != CS_IDST || timeout-- > 0); + } while (tmp != CS_IDST && timeout-- > 0); if (tmp == CS_IDST) r8a66597_bset(r8a66597,
This loop is supposed to loop until if reads something other than CS_IDST or until it times out after 30,000 attempts. But because of the || vs && bug, it will never time out and instead it will loop a minimum of 30,000 times. This bug is quite old but the code is only used in USB_DEVICE_TEST_MODE so it probably doesn't affect regular usage. Fixes: 96fe53ef5498 ("usb: gadget: r8a66597-udc: add support for TEST_MODE") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)