lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 107/175] xfs: fix duplicate verification from xfs_qm_dqflush()
    Date
    From: Brian Foster <bfoster@redhat.com>

    [ Upstream commit 629dcb38dc351947ed6a26a997d4b587f3bd5c7e ]

    The pre-flush dquot verification in xfs_qm_dqflush() duplicates the
    read verifier by checking the dquot in the on-disk buffer. Instead,
    verify the in-core variant before it is flushed to the buffer.

    Fixes: 7224fa482a6d ("xfs: add full xfs_dqblk verifier")
    Signed-off-by: Brian Foster <bfoster@redhat.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Allison Collins <allison.henderson@oracle.com>
    Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/xfs/xfs_dquot.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
    index aeb95e7391c1..3cbf248af51f 100644
    --- a/fs/xfs/xfs_dquot.c
    +++ b/fs/xfs/xfs_dquot.c
    @@ -1116,13 +1116,12 @@ xfs_qm_dqflush(
    dqb = bp->b_addr + dqp->q_bufoffset;
    ddqp = &dqb->dd_diskdq;

    - /*
    - * A simple sanity check in case we got a corrupted dquot.
    - */
    - fa = xfs_dqblk_verify(mp, dqb, be32_to_cpu(ddqp->d_id), 0);
    + /* sanity check the in-core structure before we flush */
    + fa = xfs_dquot_verify(mp, &dqp->q_core, be32_to_cpu(dqp->q_core.d_id),
    + 0);
    if (fa) {
    xfs_alert(mp, "corrupt dquot ID 0x%x in memory at %pS",
    - be32_to_cpu(ddqp->d_id), fa);
    + be32_to_cpu(dqp->q_core.d_id), fa);
    xfs_buf_relse(bp);
    xfs_dqfunlock(dqp);
    xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:06    [W:8.547 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site