lkml.org 
[lkml]   [2011]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] UDF: Close small mem leak in udf_find_entry()
  Hi,

On Sun 12-12-10 23:18:15, Jesper Juhl wrote:
> There's a small memory leak in fs/udf/namei.c::udf_find_entry().
>
> We dynamically allocate memory for 'fname' with kmalloc() and in most
> situations we free it before we leave the function, but there is one
> situation where we do not (but should). This patch closes the leak by
> jumping to the 'out_ok' label which does the correct cleanup rather than
> doing half the cleanup and returning directly.
Thanks. Merged.

Honza
>
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> ---
> namei.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> compile tested only
>
> diff --git a/fs/udf/namei.c b/fs/udf/namei.c
> index 6d8dc02..899ef91 100644
> --- a/fs/udf/namei.c
> +++ b/fs/udf/namei.c
> @@ -228,10 +228,8 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir,
> }
>
> if ((cfi->fileCharacteristics & FID_FILE_CHAR_PARENT) &&
> - isdotdot) {
> - brelse(epos.bh);
> - return fi;
> - }
> + isdotdot)
> + goto out_ok;
>
> if (!lfi)
> continue;
>
>
>
> --
> Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
> Plain text mails only, please.
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR


\
 
 \ /
  Last update: 2011-01-06 17:57    [W:0.345 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site