dmaengine Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug
@ 2019-08-16  6:48 Wenwen Wang
  2019-08-16  6:53 ` Peter Ujfalusi
  2019-08-20 11:43 ` Vinod Koul
  0 siblings, 2 replies; 3+ messages in thread
From: Wenwen Wang @ 2019-08-16  6:48 UTC (permalink / raw)
  To: Wenwen Wang
  Cc: Peter Ujfalusi, Vinod Koul, Dan Williams, Kate Stewart,
	Allison Randal, Thomas Gleixner, Enrico Weigelt, dmaengine,
	linux-kernel

In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then
of_property_read_u32_array() is invoked to search for the property.
However, if this process fails, 'rsv_events' is not deallocated, leading to
a memory leak bug. To fix this issue, free 'rsv_events' before returning
the error.

Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
---
 drivers/dma/ti/dma-crossbar.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
index ad2f0a4..f255056 100644
--- a/drivers/dma/ti/dma-crossbar.c
+++ b/drivers/dma/ti/dma-crossbar.c
@@ -391,8 +391,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
 
 		ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events,
 						 nelm * 2);
-		if (ret)
+		if (ret) {
+			kfree(rsv_events);
 			return ret;
+		}
 
 		for (i = 0; i < nelm; i++) {
 			ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1],
-- 
2.7.4


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug
  2019-08-16  6:48 [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug Wenwen Wang
@ 2019-08-16  6:53 ` Peter Ujfalusi
  2019-08-20 11:43 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Ujfalusi @ 2019-08-16  6:53 UTC (permalink / raw)
  To: Wenwen Wang
  Cc: Vinod Koul, Dan Williams, Kate Stewart, Allison Randal,
	Thomas Gleixner, Enrico Weigelt,
	open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list



On 16/08/2019 9.48, Wenwen Wang wrote:
> In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then
> of_property_read_u32_array() is invoked to search for the property.
> However, if this process fails, 'rsv_events' is not deallocated, leading to
> a memory leak bug. To fix this issue, free 'rsv_events' before returning
> the error.

Thank you,

Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
> ---
>  drivers/dma/ti/dma-crossbar.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
> index ad2f0a4..f255056 100644
> --- a/drivers/dma/ti/dma-crossbar.c
> +++ b/drivers/dma/ti/dma-crossbar.c
> @@ -391,8 +391,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev)
>  
>  		ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events,
>  						 nelm * 2);
> -		if (ret)
> +		if (ret) {
> +			kfree(rsv_events);
>  			return ret;
> +		}
>  
>  		for (i = 0; i < nelm; i++) {
>  			ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1],
> 

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug
  2019-08-16  6:48 [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug Wenwen Wang
  2019-08-16  6:53 ` Peter Ujfalusi
@ 2019-08-20 11:43 ` Vinod Koul
  1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2019-08-20 11:43 UTC (permalink / raw)
  To: Wenwen Wang
  Cc: Peter Ujfalusi, Dan Williams, Kate Stewart, Allison Randal,
	Thomas Gleixner, Enrico Weigelt,
	open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list

On 16-08-19, 01:48, Wenwen Wang wrote:
> In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then
> of_property_read_u32_array() is invoked to search for the property.
> However, if this process fails, 'rsv_events' is not deallocated, leading to
> a memory leak bug. To fix this issue, free 'rsv_events' before returning
> the error.

Applied, thanks

-- 
~Vinod

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-16  6:48 [PATCH v2] dmaengine: ti: dma-crossbar: Fix a memory leak bug Wenwen Wang
2019-08-16  6:53 ` Peter Ujfalusi
2019-08-20 11:43 ` Vinod Koul

dmaengine Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dmaengine/0 dmaengine/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dmaengine dmaengine/ https://lore.kernel.org/dmaengine \
		dmaengine@vger.kernel.org dmaengine@archiver.kernel.org
	public-inbox-index dmaengine


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.dmaengine


AGPL code for this site: git clone https://public-inbox.org/ public-inbox