usb: cdns3: change place of 'priv_ep' assignment in cdns3_gadget_ep_dequeue(), cdns3_gadget_ep_enable()
Subsystems (2)
PATCH v2 1/1 usb: cdns3: change place of 'priv_ep' assignment in cdns3_gadget_ep_dequeue(), cdns3_gadget_ep_enable()
If 'ep' is NULL, result of ep_to_cdns3_ep(ep) is invalid pointer and its dereference with priv_ep->cdns3_dev may cause panic.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/usb/cdns3/cdns3-gadget.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/cdns3/cdns3-gadget.c +6 -3
@@ -2285,13 +2285,14 @@ static int cdns3_gadget_ep_enable(struct usb_ep *ep,int val; priv_ep =ep_to_cdns3_ep (ep); - priv_dev = priv_ep->cdns3_dev; - comp_desc = priv_ep->endpoint.comp_desc;if (!ep || !desc || desc->bDescriptorType !=USB_DT_ENDPOINT ) {dev_dbg (priv_dev->dev,"usbss: invalid parameters\n" );return -EINVAL ; } + + comp_desc = priv_ep->endpoint.comp_desc; + priv_dev = priv_ep->cdns3_dev;if (!desc->wMaxPacketSize) {dev_err (priv_dev->dev,"usbss: missing wMaxPacketSize\n" );
@@ -2600,7 +2601,7 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, struct usb_request *request) {struct cdns3_endpoint *priv_ep =ep_to_cdns3_ep (ep); -struct cdns3_device *priv_dev = priv_ep->cdns3_dev; +struct cdns3_device *priv_dev;struct usb_request *req, *req_temp;struct cdns3_request *priv_req;struct cdns3_trb *link_trb;
@@ -2610,6 +2611,8 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep,if (!ep || !request || !ep->desc)return -EINVAL ; + + priv_dev = priv_ep->cdns3_dev;spin_lock_irqsave (&priv_dev->lock, flags);
Signature · 1 line
2.25.1
Quoted 43 lines · Andrey Strachuk
If 'ep' is NULL, result of
ep_to_cdns3_ep(ep)is invalid pointer and its dereference withpriv_ep->cdns3_devmay cause panic.Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by Andrey Strachuk <[email protected]>Fixes 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")--- drivers/usb/cdns3/cdns3-gadget.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/usb/cdns3/cdns3-gadget.c +4
-3@@ -2285,13 +2285,14 @@ static int cdns3_gadget_ep_enable(struct usb_ep *ep,int val; priv_ep =ep_to_cdns3_ep (ep); - priv_dev = priv_ep->cdns3_dev; - comp_desc = priv_ep->endpoint.comp_desc;if (!ep || !desc || desc->bDescriptorType !=USB_DT_ENDPOINT ) {dev_dbg (priv_dev->dev,"usbss: invalid parameters\n" );return -EINVAL ; } + + comp_desc = priv_ep->endpoint.comp_desc; + priv_dev = priv_ep->cdns3_dev;if (!desc->wMaxPacketSize) {dev_err (priv_dev->dev,"usbss: missing wMaxPacketSize\n" );@@ -2600,7 +2601,7 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, struct usb_request *request) {struct cdns3_endpoint *priv_ep =ep_to_cdns3_ep (ep); -struct cdns3_device *priv_dev = priv_ep->cdns3_dev; +struct cdns3_device *priv_dev;struct usb_request *req, *req_temp;struct cdns3_request *priv_req;struct cdns3_trb *link_trb;
drivers/usb/cdns3/cdns3-gadget.c int cdns3_gadget_ep_dequeue(struct usb_ep *ep, · line 2618
Quoted 8 lines
drivers/usb/cdns3/cdns3-gadget.c +2
-0@@ -2610,6 +2611,8 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep,if (!ep || !request || !ep->desc)return -EINVAL ; + + priv_dev = priv_ep->cdns3_dev;spin_lock_irqsave (&priv_dev->lock, flags);
Signature · 2 lines
Thanks, Peter Chen
Quoted 49 lines · Peter Chen
Quoted 48 lines · Andrey Strachuk
If 'ep' is NULL, result of
ep_to_cdns3_ep(ep)is invalid pointer and its dereference withpriv_ep->cdns3_devmay cause panic.Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by Andrey Strachuk <[email protected]>Fixes 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")--- drivers/usb/cdns3/cdns3-gadget.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/usb/cdns3/cdns3-gadget.c +6
-3@@ -2285,13 +2285,14 @@ static int cdns3_gadget_ep_enable(struct usb_ep *ep,int val; priv_ep =ep_to_cdns3_ep (ep); - priv_dev = priv_ep->cdns3_dev; - comp_desc = priv_ep->endpoint.comp_desc;if (!ep || !desc || desc->bDescriptorType !=USB_DT_ENDPOINT ) {dev_dbg (priv_dev->dev,"usbss: invalid parameters\n" );return -EINVAL ; } + + comp_desc = priv_ep->endpoint.comp_desc; + priv_dev = priv_ep->cdns3_dev;if (!desc->wMaxPacketSize) {dev_err (priv_dev->dev,"usbss: missing wMaxPacketSize\n" );@@ -2600,7 +2601,7 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, struct usb_request *request) {struct cdns3_endpoint *priv_ep =ep_to_cdns3_ep (ep); -struct cdns3_device *priv_dev = priv_ep->cdns3_dev; +struct cdns3_device *priv_dev;struct usb_request *req, *req_temp;struct cdns3_request *priv_req;struct cdns3_trb *link_trb;@@ -2610,6 +2611,8 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep,if (!ep || !request || !ep->desc)return -EINVAL ; + + priv_dev = priv_ep->cdns3_dev;
Quoted 6 lines
drivers/usb/cdns3/cdns3-gadget.c int cdns3_gadget_ep_dequeue(struct usb_ep *ep, · line 2618
Quoted 3 lines
drivers/usb/cdns3/cdns3-gadget.c +0
-0spin_lock_irqsave (&priv_dev->lock, flags);Acked-by Peter Chen <[email protected]>
Looks good, but I would suggest to move
priv_ep = ep_to_cdns3_ep(ep);
below the check of 'ep' as well.
--
Alexey