2008-01-06 16:51:06

by Julia Lawall

Subject: [PATCH] fs/jffs2: Add missing call to posix_acl_release

From: Julia Lawall <[email protected]>

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 <[email protected]>
---

diff -u -p a/fs/jffs2/acl.c b/fs/jffs2/acl.c
--- a/fs/jffs2/acl.c 2008-01-03 09:49:31.000000000 +0100
+++ b/fs/jffs2/acl.c 2008-01-06 17:38:52.000000000 +0100
@@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir
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);

2008-01-07 16:02:35

by Kohei KaiGai

Subject: Re: [PATCH] fs/jffs2: Add missing call to posix_acl_release

Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> 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 <[email protected]>
> ---
>
> diff -u -p a/fs/jffs2/acl.c b/fs/jffs2/acl.c
> --- a/fs/jffs2/acl.c 2008-01-03 09:49:31.000000000 +0100
> +++ b/fs/jffs2/acl.c 2008-01-06 17:38:52.000000000 +0100
> @@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir
> 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);

Indeed, there was a possibility to cause memory leaking.

Acked-by: KaiGai Kohei <[email protected]>

--
OSS Platform Development Division, NEC
KaiGai Kohei <[email protected]>