From: Ran Wang Date: Fri, 16 Oct 2020 04:33:26 +0000 (+0800) Subject: usb: gadget: fsl: fix null pointer checking X-Git-Tag: v5.9.9~239 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c4bb60aaf0f86fce03c9d65bc71f183166624a0f;p=users%2Fdwmw2%2Flinux.git usb: gadget: fsl: fix null pointer checking [ Upstream commit 48e7bbbbb261b007fe78aa14ae62df01d236497e ] fsl_ep_fifo_status() should return error if _ep->desc is null. Fixes: 75eaa498c99e (“usb: gadget: Correct NULL pointer checking in fsl gadget”) Reviewed-by: Peter Chen Signed-off-by: Ran Wang Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin --- diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c index a6f7b2594c090..c0cb007b749ff 100644 --- a/drivers/usb/gadget/udc/fsl_udc_core.c +++ b/drivers/usb/gadget/udc/fsl_udc_core.c @@ -1051,7 +1051,7 @@ static int fsl_ep_fifo_status(struct usb_ep *_ep) u32 bitmask; struct ep_queue_head *qh; - if (!_ep || _ep->desc || !(_ep->desc->bEndpointAddress&0xF)) + if (!_ep || !_ep->desc || !(_ep->desc->bEndpointAddress&0xF)) return -ENODEV; ep = container_of(_ep, struct fsl_ep, ep);