From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Date: Mon, 13 Sep 2021 18:33:19 -0400 Subject: [Cluster-devel] [PATCH AUTOSEL 5.14 05/25] gfs2: Switch to may_setattr in gfs2_setattr In-Reply-To: <20210913223339.435347-1-sashal@kernel.org> References: <20210913223339.435347-1-sashal@kernel.org> Message-ID: <20210913223339.435347-5-sashal@kernel.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Andreas Gruenbacher [ Upstream commit d75b9fa053e4cd278281386d860c26fdbfbe9d03 ] The permission check in gfs2_setattr is an old and outdated version of may_setattr(). Switch to the updated version. Fixes fstest generic/079. Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- fs/gfs2/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 6e15434b23ac..3130f85d2b3f 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -1985,8 +1985,8 @@ static int gfs2_setattr(struct user_namespace *mnt_userns, if (error) goto out; - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) + error = may_setattr(&init_user_ns, inode, attr->ia_valid); + if (error) goto error; error = setattr_prepare(&init_user_ns, dentry, attr); -- 2.30.2