All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
@ 2010-01-21 13:03 Ameya Palande
  2010-01-25 19:21 ` Omar Ramirez Luna
  0 siblings, 1 reply; 7+ messages in thread
From: Ameya Palande @ 2010-01-21 13:03 UTC (permalink / raw)
  To: linux-omap; +Cc: omap.ramirez, nm, deepak.chitriki

Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
---
 drivers/dsp/bridge/rmgr/proc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index a75b64a..91ab64f 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -512,6 +512,10 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
 			 "No Exec file found \n");
 	}
 func_cont:
+	if (hProcObject->g_pszLastCoff) {
+		MEM_Free(hProcObject->g_pszLastCoff);
+		hProcObject->g_pszLastCoff = NULL;
+	}
 	MEM_FreeObject(hProcObject);
 func_end:
 	GT_1trace(PROC_DebugMask, GT_ENTER,
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2010-01-21 13:03 [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart() Ameya Palande
@ 2010-01-25 19:21 ` Omar Ramirez Luna
  2010-02-01 17:31   ` Ameya Palande
  0 siblings, 1 reply; 7+ messages in thread
From: Omar Ramirez Luna @ 2010-01-25 19:21 UTC (permalink / raw)
  To: Ameya Palande
  Cc: linux-omap, omap.ramirez, Menon, Nishanth, Chitriki Rudramuni, Deepak

Hi,

On 1/21/2010 7:03 AM, Ameya Palande wrote:
> Signed-off-by: Ameya Palande<ameya.palande@nokia.com>
> ---
>   drivers/dsp/bridge/rmgr/proc.c |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
> index a75b64a..91ab64f 100644
> --- a/drivers/dsp/bridge/rmgr/proc.c
> +++ b/drivers/dsp/bridge/rmgr/proc.c
> @@ -512,6 +512,10 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
>   			 "No Exec file found \n");
>   	}
>   func_cont:
> +	if (hProcObject->g_pszLastCoff) {
> +		MEM_Free(hProcObject->g_pszLastCoff);
> +		hProcObject->g_pszLastCoff = NULL;
> +	}

Wouldn't be better to keep this inside PROC_Load in case of error?

Also MEM_Free checks for NULL.

>   	MEM_FreeObject(hProcObject);
>   func_end:
>   	GT_1trace(PROC_DebugMask, GT_ENTER,

Regards,

Omar

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2010-01-25 19:21 ` Omar Ramirez Luna
@ 2010-02-01 17:31   ` Ameya Palande
  2010-02-01 17:36     ` [PATCHv2] " Ameya Palande
  2010-02-06  0:58     ` [PATCH] " Omar Ramirez Luna
  0 siblings, 2 replies; 7+ messages in thread
From: Ameya Palande @ 2010-02-01 17:31 UTC (permalink / raw)
  To: Omar Ramirez Luna
  Cc: linux-omap, omap.ramirez, Menon, Nishanth, Chitriki Rudramuni, Deepak

Hi Omar,

On Mon, 2010-01-25 at 20:21 +0100, ext Omar Ramirez Luna wrote:
> Hi,
> 
> On 1/21/2010 7:03 AM, Ameya Palande wrote:
> > Signed-off-by: Ameya Palande<ameya.palande@nokia.com>
> > ---
> >   drivers/dsp/bridge/rmgr/proc.c |    4 ++++
> >   1 files changed, 4 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
> > index a75b64a..91ab64f 100644
> > --- a/drivers/dsp/bridge/rmgr/proc.c
> > +++ b/drivers/dsp/bridge/rmgr/proc.c
> > @@ -512,6 +512,10 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
> >   			 "No Exec file found \n");
> >   	}
> >   func_cont:
> > +	if (hProcObject->g_pszLastCoff) {
> > +		MEM_Free(hProcObject->g_pszLastCoff);
> > +		hProcObject->g_pszLastCoff = NULL;
> > +	}
> 
> Wouldn't be better to keep this inside PROC_Load in case of error?

PROC_Load allocates the memory to hProcObject->g_pszLastCoff which gets
freed in PROC_Detach. But PROC_AutoStart is a special case. It creates a
dummy ProcObject and after it is done with it, it frees it. And there it
leaks the memory. So IMO this is the correct place.

> Also MEM_Free checks for NULL.

Agreed! I will send a V2 of the patch with without the check.

> 
> >   	MEM_FreeObject(hProcObject);
> >   func_end:
> >   	GT_1trace(PROC_DebugMask, GT_ENTER,
> 
> Regards,
> 
> Omar

Thanks for your review!

Cheers,
Ameya.


^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCHv2] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2010-02-01 17:31   ` Ameya Palande
@ 2010-02-01 17:36     ` Ameya Palande
  2010-02-06  1:57       ` Omar Ramirez Luna
  2010-02-06  0:58     ` [PATCH] " Omar Ramirez Luna
  1 sibling, 1 reply; 7+ messages in thread
From: Ameya Palande @ 2010-02-01 17:36 UTC (permalink / raw)
  To: omar.ramirez; +Cc: nm, linux-omap, deepak.chitriki

Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
---
 drivers/dsp/bridge/rmgr/proc.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index 491661f..ff3329f 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -411,6 +411,8 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
 			 "No Exec file found \n");
 	}
 func_cont:
+	MEM_Free(hProcObject->g_pszLastCoff);
+	hProcObject->g_pszLastCoff = NULL;
 	MEM_FreeObject(hProcObject);
 func_end:
 	GT_1trace(PROC_DebugMask, GT_ENTER,
-- 
1.6.3.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2010-02-01 17:31   ` Ameya Palande
  2010-02-01 17:36     ` [PATCHv2] " Ameya Palande
@ 2010-02-06  0:58     ` Omar Ramirez Luna
  1 sibling, 0 replies; 7+ messages in thread
From: Omar Ramirez Luna @ 2010-02-06  0:58 UTC (permalink / raw)
  To: Ameya Palande
  Cc: linux-omap, omap.ramirez, Menon, Nishanth, Chitriki Rudramuni, Deepak

Hi,

On 2/1/2010 11:31 AM, Ameya Palande wrote:
> Hi Omar,
>
> On Mon, 2010-01-25 at 20:21 +0100, ext Omar Ramirez Luna wrote:
>> Hi,
>>
>> On 1/21/2010 7:03 AM, Ameya Palande wrote:
>>> Signed-off-by: Ameya Palande<ameya.palande@nokia.com>
>>> ---
>>>    drivers/dsp/bridge/rmgr/proc.c |    4 ++++
>>>    1 files changed, 4 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
>>> index a75b64a..91ab64f 100644
>>> --- a/drivers/dsp/bridge/rmgr/proc.c
>>> +++ b/drivers/dsp/bridge/rmgr/proc.c
>>> @@ -512,6 +512,10 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
>>>    			 "No Exec file found \n");
>>>    	}
>>>    func_cont:
>>> +	if (hProcObject->g_pszLastCoff) {
>>> +		MEM_Free(hProcObject->g_pszLastCoff);
>>> +		hProcObject->g_pszLastCoff = NULL;
>>> +	}
>>
>> Wouldn't be better to keep this inside PROC_Load in case of error?
>
> PROC_Load allocates the memory to hProcObject->g_pszLastCoff which gets
> freed in PROC_Detach. But PROC_AutoStart is a special case. It creates a
> dummy ProcObject and after it is done with it, it frees it. And there it
> leaks the memory. So IMO this is the correct place.

Ok, agree.

>
>> Also MEM_Free checks for NULL.
>
> Agreed! I will send a V2 of the patch with without the check.
>
>>
>>>    	MEM_FreeObject(hProcObject);
>>>    func_end:
>>>    	GT_1trace(PROC_DebugMask, GT_ENTER,
>>
>> Regards,
>>
>> Omar
>
> Thanks for your review!
>
> Cheers,
> Ameya.
>

- omar

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCHv2] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2010-02-01 17:36     ` [PATCHv2] " Ameya Palande
@ 2010-02-06  1:57       ` Omar Ramirez Luna
  0 siblings, 0 replies; 7+ messages in thread
From: Omar Ramirez Luna @ 2010-02-06  1:57 UTC (permalink / raw)
  To: Ameya Palande; +Cc: Menon, Nishanth, linux-omap, Chitriki Rudramuni, Deepak

On 2/1/2010 11:36 AM, Ameya Palande wrote:
> Signed-off-by: Ameya Palande<ameya.palande@nokia.com>

Acked-by: Omar Ramirez Luna <omar.ramirez@ti.com>

> ---
>   drivers/dsp/bridge/rmgr/proc.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
> index 491661f..ff3329f 100644
> --- a/drivers/dsp/bridge/rmgr/proc.c
> +++ b/drivers/dsp/bridge/rmgr/proc.c
> @@ -411,6 +411,8 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
>   			 "No Exec file found \n");
>   	}
>   func_cont:
> +	MEM_Free(hProcObject->g_pszLastCoff);
> +	hProcObject->g_pszLastCoff = NULL;
>   	MEM_FreeObject(hProcObject);
>   func_end:
>   	GT_1trace(PROC_DebugMask, GT_ENTER,

Pushed to dspbridge.

- omar

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCHv2] DSPBRIDGE: Fix memory leak in PROC_AutoStart()
  2009-09-02 18:59 Ameya Palande
@ 2009-09-02 19:07 ` Ameya Palande
  0 siblings, 0 replies; 7+ messages in thread
From: Ameya Palande @ 2009-09-02 19:07 UTC (permalink / raw)
  To: linux-omap; +Cc: omar.ramirez, x0095840

Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
---
 drivers/dsp/bridge/rmgr/proc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c
index a75b64a..eb8b4a9 100644
--- a/drivers/dsp/bridge/rmgr/proc.c
+++ b/drivers/dsp/bridge/rmgr/proc.c
@@ -512,6 +512,7 @@ DSP_STATUS PROC_AutoStart(struct CFG_DEVNODE *hDevNode,
 			 "No Exec file found \n");
 	}
 func_cont:
+	MEM_Free(hProcObject->g_pszLastCoff);
 	MEM_FreeObject(hProcObject);
 func_end:
 	GT_1trace(PROC_DebugMask, GT_ENTER,
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-02-06  1:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-21 13:03 [PATCH] DSPBRIDGE: Fix memory leak in PROC_AutoStart() Ameya Palande
2010-01-25 19:21 ` Omar Ramirez Luna
2010-02-01 17:31   ` Ameya Palande
2010-02-01 17:36     ` [PATCHv2] " Ameya Palande
2010-02-06  1:57       ` Omar Ramirez Luna
2010-02-06  0:58     ` [PATCH] " Omar Ramirez Luna
  -- strict thread matches above, loose matches on Subject: below --
2009-09-02 18:59 Ameya Palande
2009-09-02 19:07 ` [PATCHv2] " Ameya Palande

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.