Commit ce750f43 authored Oct 18, 2019 by Chengguang Xu Committed by Linus Torvalds Oct 19, 2019

ocfs2: fix error handling in ocfs2_setattr()

Should set transfer_to[USRQUOTA/GRPQUOTA] to NULL on error case before
jumping to do dqput().

Link: http://lkml.kernel.org/r/20191010082349.1134-1-cgxu519@mykernel.net


Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b749ecfa

fs/ocfs2/file.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

Admin message