Commit 36f97bc6 authored Jan 06, 2008 by Julia Lawall Committed by David Woodhouse Jan 08, 2008

[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: Julia Lawall <julia@diku.dk>
Acked-by: KaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

parent 71053fb1

fs/jffs2/acl.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);