]> git.baikalelectronics.ru Git - kernel.git/commitdiff
staging: emxx_udc: Add checks for dma_alloc_coherent()
authorYuan Can <yuancan@huawei.com>
Thu, 19 Jan 2023 08:31:19 +0000 (08:31 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:44:14 +0000 (16:44 +0100)
[ Upstream commit f6510a93cfd8c6c79b4dda0f2967cdc6df42eff4 ]

As the dma_alloc_coherent may return NULL, the return value needs to be
checked to avoid NULL poineter dereference.

Signed-off-by: Yuan Can <yuancan@huawei.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
Link: https://lore.kernel.org/r/20230119083119.16956-1-yuancan@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/emxx_udc/emxx_udc.c

index cc4c18c3fb36d09de67238ac05c7c29a4e04f3b2..7d18ad68be264096eb0335abd8ddf8bff98b753e 100644 (file)
@@ -2593,10 +2593,15 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,
                req->unaligned = false;
 
        if (req->unaligned) {
-               if (!ep->virt_buf)
+               if (!ep->virt_buf) {
                        ep->virt_buf = dma_alloc_coherent(udc->dev, PAGE_SIZE,
                                                          &ep->phys_buf,
                                                          GFP_ATOMIC | GFP_DMA);
+                       if (!ep->virt_buf) {
+                               spin_unlock_irqrestore(&udc->lock, flags);
+                               return -ENOMEM;
+                       }
+               }
                if (ep->epnum > 0)  {
                        if (ep->direct == USB_DIR_IN)
                                memcpy(ep->virt_buf, req->req.buf,