Liuwenyi
2009-Dec-21 12:01 UTC
[Ocfs2-devel] [PATCHv2 10/12]posix_acl: Add the check items
move the ACL validation check in to fs/posix_acl.c. Including nullpointer check and PTR_ERR check. --- Signed-off-by: Liuwenyi <qingshenlwy at gmail.com> Cc: Mark Fasheh <mfasheh at suse.com> Cc: Joel Becker <joel.becker at oracle.com> Cc: Tiger Yang <tiger.yang at oracle.com> Cc: Al Viro <viro at zeniv.linux.org.uk> Cc: James Morris <jmorris at namei.org> Cc: ocfs2-devel at oss.oracle.com Cc: linux-kernel at vger.kernel.org --- diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index e3e4741..b11c72c 100644 --- a/fs/ocfs2/acl.c +++ b/fs/ocfs2/acl.c @@ -408,13 +408,9 @@ static int ocfs2_xattr_set_acl(struct dentry *dentry, const char *name, if (value) { acl = posix_acl_from_xattr(value, size); - if (IS_ERR(acl)) - return PTR_ERR(acl); - else if (acl) { - ret = posix_acl_valid(acl); - if (ret) - goto cleanup; - } + ret = posix_acl_valid(acl); + if (ret) + goto cleanup; } else acl = NULL; -- Best Regards, Liuwenyi