| Message ID | 153262651940.8934.17525988748289196893.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [1/2] libxfs: add more bounds checking to sb sanity checks | expand |
On Thu, Jul 26, 2018 at 10:35:19AM -0700, Darrick J. Wong wrote: > From: Bill O'Donnell <billodo@redhat.com> > > Current sb verifier doesn't check bounds on sb_fdblocks and sb_ifree. > Add sanity checks for these parameters. > > Signed-off-by: Bill O'Donnell <billodo@redhat.com> > [darrick: remove the icount check, tweak the comments a little] > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- Reviewed-by: Bill O'Donnell <billodo@redhat.com> > fs/xfs/libxfs/xfs_sb.c | 45 +++++++++++++++++++++++++++++++++++---------- > 1 file changed, 35 insertions(+), 10 deletions(-) > > > diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c > index b3ad15956366..b2c683588519 100644 > --- a/fs/xfs/libxfs/xfs_sb.c > +++ b/fs/xfs/libxfs/xfs_sb.c > @@ -599,22 +599,16 @@ xfs_sb_to_disk( > static int > xfs_sb_verify( > struct xfs_buf *bp, > + struct xfs_sb *sb, > bool check_version) > { > struct xfs_mount *mp = bp->b_target->bt_mount; > - struct xfs_sb sb; > - > - /* > - * Use call variant which doesn't convert quota flags from disk > - * format, because xfs_mount_validate_sb checks the on-disk flags. > - */ > - __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); > > /* > * Only check the in progress field for the primary superblock as > * mkfs.xfs doesn't clear it from secondary superblocks. > */ > - return xfs_mount_validate_sb(mp, &sb, > + return xfs_mount_validate_sb(mp, sb, > bp->b_maps[0].bm_bn == XFS_SB_DADDR, > check_version); > } > @@ -637,6 +631,7 @@ xfs_sb_read_verify( > { > struct xfs_mount *mp = bp->b_target->bt_mount; > struct xfs_dsb *dsb = XFS_BUF_TO_SBP(bp); > + struct xfs_sb sb; > int error; > > /* > @@ -657,7 +652,13 @@ xfs_sb_read_verify( > } > } > } > - error = xfs_sb_verify(bp, true); > + > + /* > + * Use call variant which doesn't convert quota flags from disk > + * format, because xfs_mount_validate_sb checks the on-disk flags. > + */ > + __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); > + error = xfs_sb_verify(bp, &sb, true); > > out_error: > if (error == -EFSCORRUPTED || error == -EFSBADCRC) > @@ -693,9 +694,33 @@ xfs_sb_write_verify( > { > struct xfs_mount *mp = bp->b_target->bt_mount; > struct xfs_buf_log_item *bip = bp->b_log_item; > + struct xfs_sb sb; > int error; > > - error = xfs_sb_verify(bp, false); > + /* > + * Use call variant which doesn't convert quota flags from disk > + * format, because xfs_mount_validate_sb checks the on-disk flags. > + */ > + __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); > + > + error = xfs_sb_verify(bp, &sb, false); > + if (error) > + goto err; > + > + /* > + * Carry out additional sb sanity checks exclusively for writes. > + * We don't do these checks for reads, since faulty parameters could > + * be fixed in the log, and we shouldn't prohibit mounting for those > + * cases. > + */ > + if (sb.sb_fdblocks > sb.sb_dblocks || > + sb.sb_ifree > sb.sb_icount) { > + xfs_notice(mp, "SB summary counter sanity check failed"); > + error = -EFSCORRUPTED; > + goto err; > + } > + > +err: > if (error) { > xfs_verifier_error(bp, error, __this_address); > return; > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 26, 2018 at 10:35:19AM -0700, Darrick J. Wong wrote: > From: Bill O'Donnell <billodo@redhat.com> > > Current sb verifier doesn't check bounds on sb_fdblocks and sb_ifree. > Add sanity checks for these parameters. > > Signed-off-by: Bill O'Donnell <billodo@redhat.com> > [darrick: remove the icount check, tweak the comments a little] > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > fs/xfs/libxfs/xfs_sb.c | 45 +++++++++++++++++++++++++++++++++++---------- > 1 file changed, 35 insertions(+), 10 deletions(-) > > > diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c > index b3ad15956366..b2c683588519 100644 > --- a/fs/xfs/libxfs/xfs_sb.c > +++ b/fs/xfs/libxfs/xfs_sb.c > @@ -599,22 +599,16 @@ xfs_sb_to_disk( > static int > xfs_sb_verify( > struct xfs_buf *bp, > + struct xfs_sb *sb, > bool check_version) > { > struct xfs_mount *mp = bp->b_target->bt_mount; > - struct xfs_sb sb; > - > - /* > - * Use call variant which doesn't convert quota flags from disk > - * format, because xfs_mount_validate_sb checks the on-disk flags. > - */ > - __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); > > /* > * Only check the in progress field for the primary superblock as > * mkfs.xfs doesn't clear it from secondary superblocks. > */ > - return xfs_mount_validate_sb(mp, &sb, > + return xfs_mount_validate_sb(mp, sb, > bp->b_maps[0].bm_bn == XFS_SB_DADDR, > check_version); Why do we need to keep this wrapper function? The in-progress check is a primary superblock read verifier check (only useful at mount time), as is the "check_version" flag used to validate the V5 feature mask during mount. i.e. xfs_sb_verify() needs to go away, and the read-side only checks need to be moved from xfs_mount_validate_sb() into xfs_sb_read_verify() too. At which point, xfs_mount_validate_sb() has nothing to do with mount and can be renamed to xfs_sb_verify_common().... Cheers, Dave.
On 7/26/18 4:28 PM, Dave Chinner wrote: > On Thu, Jul 26, 2018 at 10:35:19AM -0700, Darrick J. Wong wrote: >> From: Bill O'Donnell <billodo@redhat.com> >> >> Current sb verifier doesn't check bounds on sb_fdblocks and sb_ifree. >> Add sanity checks for these parameters. >> >> Signed-off-by: Bill O'Donnell <billodo@redhat.com> >> [darrick: remove the icount check, tweak the comments a little] >> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> >> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> >> --- >> fs/xfs/libxfs/xfs_sb.c | 45 +++++++++++++++++++++++++++++++++++---------- >> 1 file changed, 35 insertions(+), 10 deletions(-) >> >> >> diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c >> index b3ad15956366..b2c683588519 100644 >> --- a/fs/xfs/libxfs/xfs_sb.c >> +++ b/fs/xfs/libxfs/xfs_sb.c >> @@ -599,22 +599,16 @@ xfs_sb_to_disk( >> static int >> xfs_sb_verify( >> struct xfs_buf *bp, >> + struct xfs_sb *sb, >> bool check_version) >> { >> struct xfs_mount *mp = bp->b_target->bt_mount; >> - struct xfs_sb sb; >> - >> - /* >> - * Use call variant which doesn't convert quota flags from disk >> - * format, because xfs_mount_validate_sb checks the on-disk flags. >> - */ >> - __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); >> >> /* >> * Only check the in progress field for the primary superblock as >> * mkfs.xfs doesn't clear it from secondary superblocks. >> */ >> - return xfs_mount_validate_sb(mp, &sb, >> + return xfs_mount_validate_sb(mp, sb, >> bp->b_maps[0].bm_bn == XFS_SB_DADDR, >> check_version); > > Why do we need to keep this wrapper function? The in-progress check > is a primary superblock read verifier check (only useful at mount > time), as is the "check_version" flag used to validate the V5 > feature mask during mount. > > i.e. xfs_sb_verify() needs to go away, and the read-side only checks > need to be moved from xfs_mount_validate_sb() into > xfs_sb_read_verify() too. At which point, xfs_mount_validate_sb() > has nothing to do with mount and can be renamed to > xfs_sb_verify_common().... Yeah, I had thought about that too, but Darrick mentioned other pending rearrangements and figured maybe it could come as a followup patch. -Eric -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index b3ad15956366..b2c683588519 100644 --- a/fs/xfs/libxfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c @@ -599,22 +599,16 @@ xfs_sb_to_disk( static int xfs_sb_verify( struct xfs_buf *bp, + struct xfs_sb *sb, bool check_version) { struct xfs_mount *mp = bp->b_target->bt_mount; - struct xfs_sb sb; - - /* - * Use call variant which doesn't convert quota flags from disk - * format, because xfs_mount_validate_sb checks the on-disk flags. - */ - __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); /* * Only check the in progress field for the primary superblock as * mkfs.xfs doesn't clear it from secondary superblocks. */ - return xfs_mount_validate_sb(mp, &sb, + return xfs_mount_validate_sb(mp, sb, bp->b_maps[0].bm_bn == XFS_SB_DADDR, check_version); } @@ -637,6 +631,7 @@ xfs_sb_read_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_dsb *dsb = XFS_BUF_TO_SBP(bp); + struct xfs_sb sb; int error; /* @@ -657,7 +652,13 @@ xfs_sb_read_verify( } } } - error = xfs_sb_verify(bp, true); + + /* + * Use call variant which doesn't convert quota flags from disk + * format, because xfs_mount_validate_sb checks the on-disk flags. + */ + __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); + error = xfs_sb_verify(bp, &sb, true); out_error: if (error == -EFSCORRUPTED || error == -EFSBADCRC) @@ -693,9 +694,33 @@ xfs_sb_write_verify( { struct xfs_mount *mp = bp->b_target->bt_mount; struct xfs_buf_log_item *bip = bp->b_log_item; + struct xfs_sb sb; int error; - error = xfs_sb_verify(bp, false); + /* + * Use call variant which doesn't convert quota flags from disk + * format, because xfs_mount_validate_sb checks the on-disk flags. + */ + __xfs_sb_from_disk(&sb, XFS_BUF_TO_SBP(bp), false); + + error = xfs_sb_verify(bp, &sb, false); + if (error) + goto err; + + /* + * Carry out additional sb sanity checks exclusively for writes. + * We don't do these checks for reads, since faulty parameters could + * be fixed in the log, and we shouldn't prohibit mounting for those + * cases. + */ + if (sb.sb_fdblocks > sb.sb_dblocks || + sb.sb_ifree > sb.sb_icount) { + xfs_notice(mp, "SB summary counter sanity check failed"); + error = -EFSCORRUPTED; + goto err; + } + +err: if (error) { xfs_verifier_error(bp, error, __this_address); return;