(RESEND) [PATCH] ocfs2: Fix error handling in ocfs2_setattr()
Should set transfer_to[USRQUOTA/GRPQUOTA] to NULL
on error case before jump to do dqput().
Signed-off-by Chengguang Xu <[email protected]>
--- fs/ocfs2/file.c | 2 ++ 1 file changed, 2 insertions(+)
fs/ocfs2/file.c +2 -0
@@ -1230,6 +1230,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[USRQUOTA ] =dqget (sb,make_kqid_uid (attr->ia_uid));if (IS_ERR (transfer_to[USRQUOTA ])) { status =PTR_ERR (transfer_to[USRQUOTA ]); + transfer_to[USRQUOTA ] =NULL ; goto bail_unlock; } }
@@ -1239,6 +1240,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[GRPQUOTA ] =dqget (sb,make_kqid_gid (attr->ia_gid));if (IS_ERR (transfer_to[GRPQUOTA ])) { status =PTR_ERR (transfer_to[GRPQUOTA ]); + transfer_to[GRPQUOTA ] =NULL ; goto bail_unlock; } }
Signature · 1 line
2.20.1
Joseph Qi
Reviewed-byQuoted 4 lines · Chengguang Xu
Should set transfer_to[USRQUOTA/GRPQUOTA] to NULL
on error case before jump to dodqput().Signed-off-by Chengguang Xu <[email protected]>
Looks good.
Reviewed-by Joseph Qi <[email protected]>
Quoted 25 lines
--- fs/ocfs2/file.c | 2 ++ 1 file changed, 2 insertions(+)fs/ocfs2/file.c +2
-0@@ -1230,6 +1230,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[USRQUOTA ] =dqget (sb,make_kqid_uid (attr->ia_uid));if (IS_ERR (transfer_to[USRQUOTA ])) { status =PTR_ERR (transfer_to[USRQUOTA ]); + transfer_to[USRQUOTA ] =NULL ; goto bail_unlock; } }@@ -1239,6 +1240,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[GRPQUOTA ] =dqget (sb,make_kqid_gid (attr->ia_gid));if (IS_ERR (transfer_to[GRPQUOTA ])) { status =PTR_ERR (transfer_to[GRPQUOTA ]); + transfer_to[GRPQUOTA ] =NULL ; goto bail_unlock; } }
Changwei Ge
Reviewed-byQuoted 9 lines · Joseph Qi
Quoted 4 lines · Chengguang Xu
Should set transfer_to[USRQUOTA/GRPQUOTA] to NULL
on error case before jump to dodqput().Signed-off-by Chengguang Xu <[email protected]>Looks good.
Reviewed-by Joseph Qi <[email protected]>
Also looks sane to me
Reviewed-by Changwei Ge <[email protected]>
Quoted 29 lines
Quoted 18 lines
--- fs/ocfs2/file.c | 2 ++ 1 file changed, 2 insertions(+)fs/ocfs2/file.c +1
-0@@ -1230,6 +1230,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[USRQUOTA ] =dqget (sb,make_kqid_uid (attr->ia_uid));if (IS_ERR (transfer_to[USRQUOTA ])) { status =PTR_ERR (transfer_to[USRQUOTA ]); + transfer_to[USRQUOTA ] =NULL ; goto bail_unlock; } }fs/ocfs2/file.c int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) · line 1246
Quoted 7 lines
fs/ocfs2/file.c +1
-0@@ -1239,6 +1240,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) transfer_to[GRPQUOTA ] =dqget (sb,make_kqid_gid (attr->ia_gid));if (IS_ERR (transfer_to[GRPQUOTA ])) { status =PTR_ERR (transfer_to[GRPQUOTA ]); + transfer_to[GRPQUOTA ] =NULL ; goto bail_unlock; } }_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel