diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-12-05 12:37:47 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-12-05 12:37:47 +1100 |
| commit | 96a3aefb8ffde23180130460b0b2407b328eb727 (patch) | |
| tree | 95c3b9855e5423120a04f9b92612b3e212e63bd8 /fs/xfs/libxfs/xfs_dir2_data.c | |
| parent | 356a3225222e5bc4df88aef3419fb6424f18ab69 (diff) | |
| download | linux-96a3aefb8ffde23180130460b0b2407b328eb727.tar.gz linux-96a3aefb8ffde23180130460b0b2407b328eb727.tar.bz2 linux-96a3aefb8ffde23180130460b0b2407b328eb727.zip | |
xfs: don't crash if reading a directory results in an unexpected hole
In xfs_dir3_data_read, we can encounter the situation where err == 0 and
*bpp == NULL if the given bno offset happens to be a hole; this leads to
a crash if we try to set the buffer type after the _da_read_buf call.
Holes can happen due to corrupt or malicious entries in the bmbt data,
so be a little more careful when we're handling buffers.
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/libxfs/xfs_dir2_data.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_dir2_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c index 725fc7841fde..e526f5a5f0be 100644 --- a/fs/xfs/libxfs/xfs_dir2_data.c +++ b/fs/xfs/libxfs/xfs_dir2_data.c @@ -329,7 +329,7 @@ xfs_dir3_data_read( err = xfs_da_read_buf(tp, dp, bno, mapped_bno, bpp, XFS_DATA_FORK, &xfs_dir3_data_buf_ops); - if (!err && tp) + if (!err && tp && *bpp) xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_DATA_BUF); return err; } |