On Tue, Sep 27, 2016 at 07:53:43PM -0700, Darrick J. Wong wrote: > 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@xxxxxxxxxx> > Reported-by: Jan Kara <jack@xxxxxxx> > --- Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > fs/xfs/xfs_dir2_readdir.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > index f44f799..2981698 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. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
