Skip to content

Commit 5a93790

Browse files
Brian Fosterdjwong
authored andcommitted
xfs: remove racy hasattr check from attr ops
xfs_attr_[get|remove]() have unlocked attribute fork checks to optimize away a lock cycle in cases where the fork does not exist or is otherwise empty. This check is not safe, however, because an attribute fork short form to extent format conversion includes a transient state that causes the xfs_inode_hasattr() check to fail. Specifically, xfs_attr_shortform_to_leaf() creates an empty extent format attribute fork and then adds the existing shortform attributes to it. This means that lookup of an existing xattr can spuriously return -ENOATTR when racing against a setxattr that causes the associated format conversion. This was originally reproduced by an untar on a particularly configured glusterfs volume, but can also be reproduced on demand with properly crafted xattr requests. The format conversion occurs under the exclusive ilock. xfs_attr_get() and xfs_attr_remove() already have the proper locking and checks further down in the functions to handle this situation correctly. Drop the unlocked checks to avoid the spurious failure and rely on the existing logic. Signed-off-by: Brian Foster <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
1 parent 76d771b commit 5a93790

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

fs/xfs/libxfs/xfs_attr.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ xfs_attr_get(
131131
if (XFS_FORCED_SHUTDOWN(ip->i_mount))
132132
return -EIO;
133133

134-
if (!xfs_inode_hasattr(ip))
135-
return -ENOATTR;
136-
137134
error = xfs_attr_args_init(&args, ip, name, flags);
138135
if (error)
139136
return error;
@@ -392,9 +389,6 @@ xfs_attr_remove(
392389
if (XFS_FORCED_SHUTDOWN(dp->i_mount))
393390
return -EIO;
394391

395-
if (!xfs_inode_hasattr(dp))
396-
return -ENOATTR;
397-
398392
error = xfs_attr_args_init(&args, dp, name, flags);
399393
if (error)
400394
return error;

0 commit comments

Comments
 (0)