Commit 36f97bc6 authored by Julia Lawall's avatar Julia Lawall Committed by David Woodhouse

[JFFS2] Add missing call to posix_acl_release

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: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarKaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 71053fb1
...@@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode) ...@@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
if (!clone) if (!clone)
return -ENOMEM; return -ENOMEM;
rc = posix_acl_create_masq(clone, (mode_t *)i_mode); rc = posix_acl_create_masq(clone, (mode_t *)i_mode);
if (rc < 0) if (rc < 0) {
posix_acl_release(clone);
return rc; return rc;
}
if (rc > 0) if (rc > 0)
jffs2_iset_acl(inode, &f->i_acl_access, clone); jffs2_iset_acl(inode, &f->i_acl_access, clone);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment