diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-10-03 09:11:15 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2016-10-03 09:11:15 -0700 |
| commit | 9cdafd8a769b7c3a54e474393fb69d1fc2c42185 (patch) | |
| tree | 9995f2fb2595fbf2bf4f2d5e1387a8edb8b4603c | |
| parent | 71be6b4942dd64bc17728f82f787be98fd8afed7 (diff) | |
| download | linux-stable-9cdafd8a769b7c3a54e474393fb69d1fc2c42185.tar.gz linux-stable-9cdafd8a769b7c3a54e474393fb69d1fc2c42185.tar.bz2 linux-stable-9cdafd8a769b7c3a54e474393fb69d1fc2c42185.zip | |
xfs: return an error when an inline directory is too small
If the size of an inline directory is so small that it doesn't
even cover the required header size, return an error to userspace
instead of ASSERTing and returning 0 like everything's ok.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reported-by: Jan Kara <jack@suse.cz>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | fs/xfs/xfs_dir2_readdir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c index f44f79996978..29816981b50a 100644 --- a/fs/xfs/xfs_dir2_readdir.c +++ b/fs/xfs/xfs_dir2_readdir.c @@ -84,7 +84,8 @@ xfs_dir2_sf_getdents( sfp = (xfs_dir2_sf_hdr_t *)dp->i_df.if_u1.if_data; - ASSERT(dp->i_d.di_size >= xfs_dir2_sf_hdr_size(sfp->i8count)); + if (dp->i_d.di_size < xfs_dir2_sf_hdr_size(sfp->i8count)) + return -EFSCORRUPTED; /* * If the block number in the offset is out of range, we're done. |