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: David Woodhouse <[email protected]>
Cc: Al Viro <[email protected]>
Cc: James Morris <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Serge Hallyn <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 7cdc319..1eb4726 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -403,13 +403,10 @@ static int jffs2_acl_setxattr(struct dentry
*dentry, const char *name,
if (value) {
acl = posix_acl_from_xattr(value, size);
- if (IS_ERR(acl))
- return PTR_ERR(acl);
- if (acl) {
- rc = posix_acl_valid(acl);
- if (rc)
- goto out;
- }
+ rc = posix_acl_valid(acl);
+ if (rc)
+ goto out;
+
} else {
acl = NULL;
}
--
Best Regards,
Liuwenyi