Skip to content

Commit e358d4b

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> [ Adjust context: removed metadata health tracking calls ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6f06f45 commit e358d4b

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

fs/xfs/libxfs/xfs_attr_remote.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,13 @@ xfs_attr_rmtval_get(
418418
dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount);
419419
error = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt,
420420
0, &bp, &xfs_attr3_rmt_buf_ops);
421+
/*
422+
* ENODATA from disk implies a disk medium failure;
423+
* ENODATA for xattrs means attribute not found, so
424+
* disambiguate that here.
425+
*/
426+
if (error == -ENODATA)
427+
error = -EIO;
421428
if (error)
422429
return error;
423430

fs/xfs/libxfs/xfs_da_btree.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,6 +2648,12 @@ xfs_da_read_buf(
26482648

26492649
error = xfs_trans_read_buf_map(mp, tp, mp->m_ddev_targp, mapp, nmap, 0,
26502650
&bp, ops);
2651+
/*
2652+
* ENODATA from disk implies a disk medium failure; ENODATA for
2653+
* xattrs means attribute not found, so disambiguate that here.
2654+
*/
2655+
if (error == -ENODATA && whichfork == XFS_ATTR_FORK)
2656+
error = -EIO;
26512657
if (error)
26522658
goto out_free;
26532659

0 commit comments

Comments
 (0)