linux-kernel - Re: [PATCH] dma: mic_x100: add missing spin

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151130152724.GF3901@localhost>
Date:	Mon, 30 Nov 2015 20:57:24 +0530
From:	Vinod Koul <vinod.koul@...el.com>
To:	Saurabh Sengar <saurabh.truth@...il.com>
Cc:	dan.j.williams@...el.com, dmaengine@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] dma: mic_x100: add missing spin_unlock

On Mon, Nov 09, 2015 at 06:05:39PM +0530, Saurabh Sengar wrote:
> spin lock should be released while returning from function
> 
> Signed-off-by: Saurabh Sengar <saurabh.truth@...il.com>
> ---
>  drivers/dma/mic_x100_dma.c | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c
> index 068e920..7f6d477 100644
> --- a/drivers/dma/mic_x100_dma.c
> +++ b/drivers/dma/mic_x100_dma.c
> @@ -317,17 +317,21 @@ mic_dma_prep_memcpy_lock(struct dma_chan *ch, dma_addr_t dma_dest,
>  	struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
>  	struct device *dev = mic_dma_ch_to_device(mic_ch);
>  	int result;
> +	struct dma_async_tx_descriptor *tx = NULL;
>  
>  	if (!len && !flags)
> -		return NULL;
> +		return tx;

This one doesn't make sense, tx will be NULL here, so orignal one is fine

>  
>  	spin_lock(&mic_ch->prep_lock);
>  	result = mic_dma_do_dma(mic_ch, flags, dma_src, dma_dest, len);
>  	if (result >= 0)
> -		return allocate_tx(mic_ch);
> -	dev_err(dev, "Error enqueueing dma, error=%d\n", result);
> +		tx = allocate_tx(mic_ch);
> +
> +	if(!tx)
> +		dev_err(dev, "Error enqueueing dma, error=%d\n", result);
> +
>  	spin_unlock(&mic_ch->prep_lock);
> -	return NULL;
> +	return tx;
>  }
>  
>  static struct dma_async_tx_descriptor *
> @@ -335,13 +339,14 @@ mic_dma_prep_interrupt_lock(struct dma_chan *ch, unsigned long flags)
>  {
>  	struct mic_dma_chan *mic_ch = to_mic_dma_chan(ch);
>  	int ret;
> +	struct dma_async_tx_descriptor *tx = NULL;
>  
>  	spin_lock(&mic_ch->prep_lock);
>  	ret = mic_dma_do_dma(mic_ch, flags, 0, 0, 0);
>  	if (!ret)
> -		return allocate_tx(mic_ch);
> +		tx = allocate_tx(mic_ch);
>  	spin_unlock(&mic_ch->prep_lock);
> -	return NULL;
> +	return tx;
>  }
>  
>  /* Return the status of the transaction */
> -- 
> 1.9.1
> 

-- 
~Vinod
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/