move the ACL validation check in to fs/posix_acl.c.
Including nullpointer check and PTR_ERR check.
---
Signed-off-by: Liuwenyi <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Tiger Yang <[email protected]>
Cc: Al Viro <[email protected]>
Cc: James Morris <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
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