diff mbox

[1/1] dmaengine: Use Pointer xt after NULL check.

Message ID 1435314888-20491-1-git-send-email-maninder1.s@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maninder Singh June 26, 2015, 10:34 a.m. UTC 
Removing static analysis error:-
Possible null pointer dereference: xt

Because currently xt is dereferenced before NULL check,
Thus Use it after NULL Check.

Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
Reviewed-by: Vaneet Narang <v.narang@samsung.com>
---
 drivers/dma/at_hdmac.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Nicolas Ferre June 26, 2015, 12:24 p.m. UTC | #1 
Le 26/06/2015 12:34, Maninder Singh a écrit :
> Removing static analysis error:-
> Possible null pointer dereference: xt
> 
> Because currently xt is dereferenced before NULL check,
> Thus Use it after NULL Check.
> 
> Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
> Reviewed-by: Vaneet Narang <v.narang@samsung.com>

Ok:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

> ---
>  drivers/dma/at_hdmac.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
> index 59892126..d313acb 100644
> --- a/drivers/dma/at_hdmac.c
> +++ b/drivers/dma/at_hdmac.c
> @@ -659,14 +659,14 @@ atc_prep_dma_interleaved(struct dma_chan *chan,
>  	size_t			len = 0;
>  	int			i;
>  
> +	if (unlikely(!xt || xt->numf != 1 || !xt->frame_size))
> +		return NULL;
> +
>  	dev_info(chan2dev(chan),
>  		 "%s: src=0x%08x, dest=0x%08x, numf=%d, frame_size=%d, flags=0x%lx\n",
>  		__func__, xt->src_start, xt->dst_start, xt->numf,
>  		xt->frame_size, flags);
>  
> -	if (unlikely(!xt || xt->numf != 1 || !xt->frame_size))
> -		return NULL;
> -
>  	/*
>  	 * The controller can only "skip" X bytes every Y bytes, so we
>  	 * need to make sure we are given a template that fit that
>
Vinod Koul July 7, 2015, 4:22 a.m. UTC | #2 
On Fri, Jun 26, 2015 at 04:04:48PM +0530, Maninder Singh wrote:
> Removing static analysis error:-
> Possible null pointer dereference: xt
> 
> Because currently xt is dereferenced before NULL check,
> Thus Use it after NULL Check.
> 
Applied, thanks
diff mbox

Patch

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 59892126..d313acb 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -659,14 +659,14 @@  atc_prep_dma_interleaved(struct dma_chan *chan,
 	size_t			len = 0;
 	int			i;
 
+	if (unlikely(!xt || xt->numf != 1 || !xt->frame_size))
+		return NULL;
+
 	dev_info(chan2dev(chan),
 		 "%s: src=0x%08x, dest=0x%08x, numf=%d, frame_size=%d, flags=0x%lx\n",
 		__func__, xt->src_start, xt->dst_start, xt->numf,
 		xt->frame_size, flags);
 
-	if (unlikely(!xt || xt->numf != 1 || !xt->frame_size))
-		return NULL;
-
 	/*
 	 * The controller can only "skip" X bytes every Y bytes, so we
 	 * need to make sure we are given a template that fit that