diff --git a/[refs] b/[refs] index e1d328fa1763..e1c082c5abbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71053fb1c645e86feb48051d6a4c58b8f2b26806 +refs/heads/master: 36f97bc617e2c31d16b74e89cd2406de4d24ede5 diff --git a/trunk/fs/jffs2/acl.c b/trunk/fs/jffs2/acl.c index 993ddfce0318..4c80404a9aba 100644 --- a/trunk/fs/jffs2/acl.c +++ b/trunk/fs/jffs2/acl.c @@ -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);