public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch 2/2] memstick: memory leak on error in msb_ftl_scan()
@ 2012-09-29  7:11 Dan Carpenter
  2012-09-29 22:10 ` Maxim Levitsky
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2012-09-29  7:11 UTC (permalink / raw)
  To: Maxim Levitsky; +Cc: linux-kernel, kernel-janitors, Andrew Morton, Jens Axboe

We need to free "overwrite_flags" before returning.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index a8e8915..1f9d5cf 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -1408,8 +1408,10 @@ static int msb_ftl_scan(struct msb_data *msb)
 			msb_mark_block_used(msb, pba);
 			msb_erase_block(msb, pba);
 			continue;
-		} else if (error)
+		} else if (error) {
+			kfree(overwrite_flags);
 			return error;
+		}
 
 		lba = be16_to_cpu(extra.logical_address);
 		managment_flag = extra.management_flag;

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

* Re: [patch 2/2] memstick: memory leak on error in msb_ftl_scan()
  2012-09-29  7:11 [patch 2/2] memstick: memory leak on error in msb_ftl_scan() Dan Carpenter
@ 2012-09-29 22:10 ` Maxim Levitsky
  2012-09-29 22:14   ` Maxim Levitsky
  0 siblings, 1 reply; 3+ messages in thread
From: Maxim Levitsky @ 2012-09-29 22:10 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: linux-kernel, kernel-janitors, Andrew Morton, Jens Axboe

On Sat, 2012-09-29 at 10:11 +0300, Dan Carpenter wrote: 
> We need to free "overwrite_flags" before returning.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index a8e8915..1f9d5cf 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -1408,8 +1408,10 @@ static int msb_ftl_scan(struct msb_data *msb)
>  			msb_mark_block_used(msb, pba);
>  			msb_erase_block(msb, pba);
>  			continue;
> -		} else if (error)
> +		} else if (error) {
> +			kfree(overwrite_flags);
>  			return error;
> +		}
>  
>  		lba = be16_to_cpu(extra.logical_address);
>  		managment_flag = extra.management_flag;

Indeed. I need to be more careful with this,
I'll do another review of the code, maybe I spot anything else.

Acked-by: Maxim Levitsky <maximlevitsly@gmail.com>

Best regards,
Maxim Levitsky


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

* Re: [patch 2/2] memstick: memory leak on error in msb_ftl_scan()
  2012-09-29 22:10 ` Maxim Levitsky
@ 2012-09-29 22:14   ` Maxim Levitsky
  0 siblings, 0 replies; 3+ messages in thread
From: Maxim Levitsky @ 2012-09-29 22:14 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: linux-kernel, kernel-janitors, Andrew Morton, Jens Axboe

On Sun, 2012-09-30 at 00:10 +0200, Maxim Levitsky wrote: 
> On Sat, 2012-09-29 at 10:11 +0300, Dan Carpenter wrote: 
> > We need to free "overwrite_flags" before returning.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > 
> > diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> > index a8e8915..1f9d5cf 100644
> > --- a/drivers/memstick/core/ms_block.c
> > +++ b/drivers/memstick/core/ms_block.c
> > @@ -1408,8 +1408,10 @@ static int msb_ftl_scan(struct msb_data *msb)
> >  			msb_mark_block_used(msb, pba);
> >  			msb_erase_block(msb, pba);
> >  			continue;
> > -		} else if (error)
> > +		} else if (error) {
> > +			kfree(overwrite_flags);
> >  			return error;
> > +		}
> >  
> >  		lba = be16_to_cpu(extra.logical_address);
> >  		managment_flag = extra.management_flag;
> 
> Indeed. I need to be more careful with this,
> I'll do another review of the code, maybe I spot anything else.
> 
> Acked-by: Maxim Levitsky <maximlevitsly@gmail.com>
maximlevitsky@gmail.com> :-(





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

end of thread, other threads:[~2012-09-29 22:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-29  7:11 [patch 2/2] memstick: memory leak on error in msb_ftl_scan() Dan Carpenter
2012-09-29 22:10 ` Maxim Levitsky
2012-09-29 22:14   ` Maxim Levitsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox