]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
UDF: Close small mem leak in udf_find_entry()
authorJesper Juhl <jj@chaosbits.net>
Sun, 12 Dec 2010 22:18:15 +0000 (23:18 +0100)
committerJan Kara <jack@suse.cz>
Thu, 6 Jan 2011 16:53:53 +0000 (17:53 +0100)
Hi,

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.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/namei.c

index a2974f7563a283c391a0ba6fc504c9da8528e439..2be0f9eb86d2d6878943ad4030667ec2a8a2ef0b 100644 (file)
@@ -227,10 +227,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;