[PATCHv2 03/12]posix_acl: Add the check items

[PATCHv2 03/12]posix_acl: Add the check items

[Liuwenyi]

move the ACL validation check in to fs/posix_acl.c.
Including nullpointer check and PTR_ERR check.

---
Signed-off-by: Liuwenyi <qingshenlwy@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: James Morris <jmorris@namei.org>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-ext4@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

---
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index a99e543..480fe88 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -403,13 +403,11 @@ ext2_xattr_set_acl(struct dentry *dentry, const
char *name, const void *value,

if (value) {
acl = posix_acl_from_xattr(value, size);
- if (IS_ERR(acl))
- return PTR_ERR(acl);
- else if (acl) {
- error = posix_acl_valid(acl);
- if (error)
- goto release_and_out;
- }
+
+ error = posix_acl_valid(acl);
+ if (error)
+ goto release_and_out;
+
} else
acl = NULL;


-- 
Best Regards,
Liuwenyi

Re: [PATCHv2 03/12]posix_acl: Add the check items

[Serge E. Hallyn]

Quoting Liuwenyi (qingshenlwy@gmail.com):
> move the ACL validation check in to fs/posix_acl.c.
> Including nullpointer check and PTR_ERR check.
> 
> ---
> Signed-off-by: Liuwenyi <qingshenlwy@gmail.com>
> Cc: Al Viro <viro@zeniv.linux.org.uk>
> Cc: James Morris <jmorris@namei.org>
> Cc: Joel Becker <joel.becker@oracle.com>
> Cc: Serge Hallyn <serue@us.ibm.com>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: linux-ext4@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> 
> ---
> diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
> index a99e543..480fe88 100644
> --- a/fs/ext2/acl.c
> +++ b/fs/ext2/acl.c
> @@ -403,13 +403,11 @@ ext2_xattr_set_acl(struct dentry *dentry, const
> char *name, const void *value,
> 
> if (value) {
> acl = posix_acl_from_xattr(value, size);
> - if (IS_ERR(acl))
> - return PTR_ERR(acl);
> - else if (acl) {
> - error = posix_acl_valid(acl);
> - if (error)
> - goto release_and_out;
> - }
> +
> + error = posix_acl_valid(acl);
> + if (error)
> + goto release_and_out;

Don't you also need to either update posix_acl_release() in your
first patch to handle IS_ERR(acl), or else update the release_and_out:
path in each caller?

> +
> } else
> acl = NULL;
> 
> 
> -- 
> Best Regards,
> Liuwenyi