Commit ceeab92971e8af05c1e81a4ff2c271124b55bb9b

Authored by Julia Lawall
Committed by Tyler Hicks
1 parent 31f73bee3e

fs/ecryptfs/file.c: introduce missing free

The comments in the code indicate that file_info should be released if the
function fails.  This releasing is done at the label out_free, not out.

The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = kmem_cache_zalloc(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
(
x->f1 = E
|
 (x->f1 == NULL || ...)
|
 f(...,x->f1,...)
)
...>
(
 return <+...x...+>;
|
 return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmem_cache_zalloc %s" % (p1[0].file,p1[0].line)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: stable@kernel.org
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -199,7 +199,7 @@
199 199 "the persistent file for the dentry with name "
200 200 "[%s]; rc = [%d]\n", __func__,
201 201 ecryptfs_dentry->d_name.name, rc);
202   - goto out;
  202 + goto out_free;
203 203 }
204 204 }
205 205 if ((ecryptfs_inode_to_private(inode)->lower_file->f_flags & O_RDONLY)
... ... @@ -207,7 +207,7 @@
207 207 rc = -EPERM;
208 208 printk(KERN_WARNING "%s: Lower persistent file is RO; eCryptfs "
209 209 "file must hence be opened RO\n", __func__);
210   - goto out;
  210 + goto out_free;
211 211 }
212 212 ecryptfs_set_file_lower(
213 213 file, ecryptfs_inode_to_private(inode)->lower_file);