[PATCH AUTOSEL 5.13 03/19] gfs2: Switch to may_setattr in gfs2_setattr
From: Sasha Levin <sashal@kernel.org>
Date: 2021-09-13 22:35:42
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), gfs2 file system, the rest · Maintainers:
Alexander Viro, Christian Brauner, Andreas Gruenbacher, Linus Torvalds
From: Andreas Gruenbacher <agruenba@redhat.com> [ 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 <agruenba@redhat.com> Signed-off-by: Bob Peterson <redacted> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org> --- 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