fs: reset read-only fsflags together with xflags

While setting file attributes, the read-only flags are reset
for ->xflags, but not for ->flags if flag is shared between both. This
is fine for now as all read-only xflags don't overlap with flags.
However, for any read-only shared flag this will create inconsistency
between xflags and flags. The non-shared flag will be reset in
vfs_fileattr_set() to the current value, but shared one is past further
to ->fileattr_set.

Reported-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
Link: https://patch.msgid.link/20260121193645.3611716-1-aalbersh@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/file_attr.c b/fs/file_attr.c
index 4c4916632f11d1deefce4e1d1cd03520b302e36c..f3704881c1265e176fb2a1639061a64cdd56a34c 100644 (file)
--- a/fs/file_attr.c
+++ b/fs/file_attr.c
@@ -141,8 +141,7 @@ static int file_attr_to_fileattr(const struct file_attr *fattr,
        if (fattr->fa_xflags & ~mask)
                return -EINVAL;
 
-       fileattr_fill_xflags(fa, fattr->fa_xflags);
-       fa->fsx_xflags &= ~FS_XFLAG_RDONLY_MASK;
+       fileattr_fill_xflags(fa, fattr->fa_xflags & ~FS_XFLAG_RDONLY_MASK);
        fa->fsx_extsize = fattr->fa_extsize;
        fa->fsx_projid = fattr->fa_projid;
        fa->fsx_cowextsize = fattr->fa_cowextsize;
@@ -162,8 +161,7 @@ static int copy_fsxattr_from_user(struct file_kattr *fa,
        if (xfa.fsx_xflags & ~mask)
                return -EOPNOTSUPP;
 
-       fileattr_fill_xflags(fa, xfa.fsx_xflags);
-       fa->fsx_xflags &= ~FS_XFLAG_RDONLY_MASK;
+       fileattr_fill_xflags(fa, xfa.fsx_xflags & ~FS_XFLAG_RDONLY_MASK);
        fa->fsx_extsize = xfa.fsx_extsize;
        fa->fsx_nextents = xfa.fsx_nextents;
        fa->fsx_projid = xfa.fsx_projid;