diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-12-05 12:38:11 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-05 12:38:11 +1100 |
| commit | 0f352f8ee8412bd9d34fb2a6411241da61175c0e (patch) | |
| tree | 784a002b8122667ab1f2f6a819dc1d99523bf4c2 /fs/xfs | |
| parent | 96a3aefb8ffde23180130460b0b2407b328eb727 (diff) | |
| download | linux-0f352f8ee8412bd9d34fb2a6411241da61175c0e.tar.gz linux-0f352f8ee8412bd9d34fb2a6411241da61175c0e.tar.bz2 linux-0f352f8ee8412bd9d34fb2a6411241da61175c0e.zip | |
xfs: error out if trying to add attrs and anextents > 0
We shouldn't assert if somehow we end up trying to add an attr fork to
an inode that apparently already has attr extents because this is an
indication of on-disk corruption. Instead, return an error code to
userspace.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 829ad632533b..29ffc0569ce1 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -1153,6 +1153,10 @@ xfs_bmap_add_attrfork( goto trans_cancel; if (XFS_IFORK_Q(ip)) goto trans_cancel; + if (ip->i_d.di_anextents != 0) { + error = -EFSCORRUPTED; + goto trans_cancel; + } if (ip->i_d.di_aformat != XFS_DINODE_FMT_EXTENTS) { /* * For inodes coming from pre-6.2 filesystems. @@ -1160,7 +1164,6 @@ xfs_bmap_add_attrfork( ASSERT(ip->i_d.di_aformat == 0); ip->i_d.di_aformat = XFS_DINODE_FMT_EXTENTS; } - ASSERT(ip->i_d.di_anextents == 0); xfs_trans_ijoin(tp, ip, 0); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |