* [PATCH] dmaengine: ti: Fix a memory leak bug
@ 2019-08-16 6:23 Wenwen Wang
2019-08-16 6:43 ` Peter Ujfalusi
0 siblings, 1 reply; 3+ messages in thread
From: Wenwen Wang @ 2019-08-16 6:23 UTC (permalink / raw)
To: Wenwen Wang
Cc: Dan Williams, Vinod Koul, Enrico Weigelt, Greg Kroah-Hartman,
Thomas Gleixner, Kate Stewart,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list
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 related [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: ti: Fix a memory leak bug
2019-08-16 6:23 [PATCH] dmaengine: ti: Fix a memory leak bug Wenwen Wang
@ 2019-08-16 6:43 ` Peter Ujfalusi
2019-08-16 6:45 ` Wenwen Wang
0 siblings, 1 reply; 3+ messages in thread
From: Peter Ujfalusi @ 2019-08-16 6:43 UTC (permalink / raw)
To: Wenwen Wang
Cc: Dan Williams, Vinod Koul, Enrico Weigelt, Greg Kroah-Hartman,
Thomas Gleixner, Kate Stewart,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list
On 16/08/2019 9.23, 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.
Can you change the subject to:
"dmaengine: ti: dma-crossbar: Fix a memory leak bug" ?
Otherwise: Thank you, and
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] dmaengine: ti: Fix a memory leak bug
2019-08-16 6:43 ` Peter Ujfalusi
@ 2019-08-16 6:45 ` Wenwen Wang
0 siblings, 0 replies; 3+ messages in thread
From: Wenwen Wang @ 2019-08-16 6:45 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Dan Williams, Vinod Koul, Enrico Weigelt, Greg Kroah-Hartman,
Thomas Gleixner, Kate Stewart,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list,
Wenwen Wang
On Fri, Aug 16, 2019 at 2:42 AM Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
>
>
>
> On 16/08/2019 9.23, 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.
>
> Can you change the subject to:
> "dmaengine: ti: dma-crossbar: Fix a memory leak bug" ?
No problem. I will rework the patch. Thanks for your suggestion!
Wenwen
>
> Otherwise: Thank you, and
> 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
end of thread, other threads:[~2019-08-16 7:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-16 6:23 [PATCH] dmaengine: ti: Fix a memory leak bug Wenwen Wang
2019-08-16 6:43 ` Peter Ujfalusi
2019-08-16 6:45 ` Wenwen Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).