public inbox for linux-staging@lists.linux.dev
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: Yuan Can <yuancan@huawei.com>
Cc: gregkh@linuxfoundation.org, drv@mailo.com,
	damm+renesas@opensource.se, error27@gmail.com,
	linux-staging@lists.linux.dev
Subject: Re: [PATCH v3] staging: emxx_udc: Add checks for dma_alloc_coherent()
Date: Thu, 19 Jan 2023 11:49:40 +0100	[thread overview]
Message-ID: <Y8kgRGvYdx+BlKij@vergenet.net> (raw)
In-Reply-To: <20230119083119.16956-1-yuancan@huawei.com>

On Thu, Jan 19, 2023 at 08:31:19AM +0000, Yuan Can wrote:
> As the dma_alloc_coherent may return NULL, the return value needs to be
> checked to avoid NULL poineter dereference.
> 
> Fixes: 33aa8d45a4fe ("staging: emxx_udc: Add Emma Mobile USB Gadget driver")
> Signed-off-by: Yuan Can <yuancan@huawei.com>
> ---
> changes in v2:
> - do the null pointer check right before the memcpy().
> changes in v3:
> - do the null pointer check right after the dma_alloc_coherent().
> 
>  drivers/staging/emxx_udc/emxx_udc.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

I am no longer associated with Renesas, as I was when the patch
that added this problem was accepted.

But, FWIIW,

Reviewed-by: Simon Horman <horms@verge.net.au>

> 
> diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
> index b4e19174bef2..f9765841c4aa 100644
> --- a/drivers/staging/emxx_udc/emxx_udc.c
> +++ b/drivers/staging/emxx_udc/emxx_udc.c
> @@ -2587,10 +2587,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,
> -- 
> 2.17.1
> 

  reply	other threads:[~2023-01-19 10:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-19  8:31 [PATCH v3] staging: emxx_udc: Add checks for dma_alloc_coherent() Yuan Can
2023-01-19 10:49 ` Simon Horman [this message]
2023-01-19 13:23 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y8kgRGvYdx+BlKij@vergenet.net \
    --to=horms@verge.net.au \
    --cc=damm+renesas@opensource.se \
    --cc=drv@mailo.com \
    --cc=error27@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=yuancan@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox