Skip to content

Commit 39fc274

Browse files
Eric Sandeengregkh
authored andcommitted
xfs: do not propagate ENODATA disk errors into xattr code
commit ae668cd upstream. ENODATA (aka ENOATTR) has a very specific meaning in the xfs xattr code; namely, that the requested attribute name could not be found. However, a medium error from disk may also return ENODATA. At best, this medium error may escape to userspace as "attribute not found" when in fact it's an IO (disk) error. At worst, we may oops in xfs_attr_leaf_get() when we do: error = xfs_attr_leaf_hasname(args, &bp); if (error == -ENOATTR) { xfs_trans_brelse(args->trans, bp); return error; } because an ENODATA/ENOATTR error from disk leaves us with a null bp, and the xfs_trans_brelse will then null-deref it. As discussed on the list, we really need to modify the lower level IO functions to trap all disk errors and ensure that we don't let unique errors like this leak up into higher xfs functions - many like this should be remapped to EIO. However, this patch directly addresses a reported bug in the xattr code, and should be safe to backport to stable kernels. A larger-scope patch to handle more unique errors at lower levels can follow later. (Note, prior to 07120f1 we did not oops, but we did return the wrong error code to userspace.) Signed-off-by: Eric Sandeen <sandeen@redhat.com> Fixes: 07120f1 ("xfs: Add xfs_has_attr and subroutines") Cc: stable@vger.kernel.org # v5.9+ Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2809b4a commit 39fc274

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

fs/xfs/libxfs/xfs_attr_remote.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,13 @@ xfs_attr_rmtval_get(
435435
0, &bp, &xfs_attr3_rmt_buf_ops);
436436
if (xfs_metadata_is_sick(error))
437437
xfs_dirattr_mark_sick(args->dp, XFS_ATTR_FORK);
438+
/*
439+
* ENODATA from disk implies a disk medium failure;
440+
* ENODATA for xattrs means attribute not found, so
441+
* disambiguate that here.
442+
*/
443+
if (error == -ENODATA)
444+
error = -EIO;
438445
if (error)
439446
return error;
440447

fs/xfs/libxfs/xfs_da_btree.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,6 +2833,12 @@ xfs_da_read_buf(
28332833
&bp, ops);
28342834
if (xfs_metadata_is_sick(error))
28352835
xfs_dirattr_mark_sick(dp, whichfork);
2836+
/*
2837+
* ENODATA from disk implies a disk medium failure; ENODATA for
2838+
* xattrs means attribute not found, so disambiguate that here.
2839+
*/
2840+
if (error == -ENODATA && whichfork == XFS_ATTR_FORK)
2841+
error = -EIO;
28362842
if (error)
28372843
goto out_free;
28382844

0 commit comments

Comments
 (0)