lkml.org 
[lkml]   [2010]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] omfs: fix memory leak
On Sat, Jul 03, 2010 at 10:33:48PM -0400, Davidlohr Bueso wrote:
> Hi,
>
> In omfs_fill_super(), when returning on error, sbi is not being freed.
>
> Thanks,
> Davidlohr.

Hi Davidlohr,

I don't think this is right:

fill_super:
err = omfs_fill_super()
if (err)
deactivate_locked_super(sb)
kill_sb()
generic_shutdown_super()
sop->put_super()
...
omfs_put_super()
kfree(sbi->s_imap);
kfree(sbi);

So your change would cause a crash at the first kfree in omfs_put_super().

It looks fine to me as-is, or am I missing something?

>
> Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> ---
> fs/omfs/inode.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
> index 089839a..253846e 100644
> --- a/fs/omfs/inode.c
> +++ b/fs/omfs/inode.c
> @@ -523,12 +523,14 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)
> }
> printk(KERN_DEBUG "omfs: Mounted volume %s\n", omfs_rb->r_name);
>
> - ret = 0;
> + ret = 0; /* success */
> out_brelse_bh2:
> brelse(bh2);
> out_brelse_bh:
> brelse(bh);
> end:
> + if (ret != 0)
> + kfree(sbi);
> return ret;
> }

--
Bob Copeland %% www.bobcopeland.com



\
 
 \ /
  Last update: 2010-07-04 13:43    [W:1.843 / U:0.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site