]> err.no Git - linux-2.6/commitdiff
[JFFS2] Add missing call to posix_acl_release
authorJulia Lawall <julia@diku.dk>
Sun, 6 Jan 2008 16:50:34 +0000 (17:50 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Tue, 8 Jan 2008 07:48:58 +0000 (07:48 +0000)
posix_acl_clone does a memory allocation and sets a reference count, so
posix_acl_release is needed afterwards to free it.

The problem was fixed using the following semantic patch.
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
type T;
identifier E;
expression E1, E2;
int ret;
statement S;
@@

  T E;
  <+...
(
  E = \(posix_acl_clone\|posix_acl_alloc\|posix_acl_dup\)(...);
  if (E == NULL) S
|
  if ((E = \(posix_acl_clone\|posix_acl_alloc\|posix_acl_dup\)(...)) == NULL) S
)
  ... when != E2 = E
      when strict
(
  posix_acl_release(E);
|
  E1 = E;
|
+ posix_acl_release(E);
  return;
|
+ posix_acl_release(E);
  return ret;
)
  ...+>
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: KaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
fs/jffs2/acl.c

index 993ddfce031836d67abe98b611e4392eda549b90..4c80404a9abae4b61e075135bb62441450596b11 100644 (file)
@@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
                if (!clone)
                        return -ENOMEM;
                rc = posix_acl_create_masq(clone, (mode_t *)i_mode);
-               if (rc < 0)
+               if (rc < 0) {
+                       posix_acl_release(clone);
                        return rc;
+               }
                if (rc > 0)
                        jffs2_iset_acl(inode, &f->i_acl_access, clone);