From: Dave Chinner <david@fromorbit.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 1/5] xfs: check the uniqueness of the AGFL entries
Date: Thu, 9 Nov 2017 13:08:29 +1100 [thread overview]
Message-ID: <20171109020829.GK4094@dastard> (raw)
In-Reply-To: <151001660786.26786.14027251894350460924.stgit@magnolia>
On Mon, Nov 06, 2017 at 05:03:27PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Make sure we don't list a block twice in the agfl.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
.....
> /* Scrub the AGFL. */
> int
> xfs_scrub_agfl(
> struct xfs_scrub_context *sc)
> {
> + struct xfs_scrub_agfl_info sai = { 0 };
> + struct xfs_agf *agf;
> + size_t sz;
> xfs_agnumber_t agno;
> + unsigned int agflcount;
> + unsigned int i;
> int error;
>
> agno = sc->sa.agno = sc->sm->sm_agno;
> @@ -508,8 +532,33 @@ xfs_scrub_agfl(
> if (!sc->sa.agf_bp)
> return -EFSCORRUPTED;
>
> + /* Allocate buffer to ensure uniqueness of AGFL entries. */
> + agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);
> + agflcount = be32_to_cpu(agf->agf_flcount);
> + sz = sizeof(xfs_agblock_t) * agflcount;
> + if (sz > sc->mp->m_sb.sb_sectsize) {
No need for sz?
if (agflcount > XFS_AGFL_SIZE(mp)
> + xfs_scrub_block_set_corrupt(sc, sc->sa.agf_bp);
> + goto out;
> + }
> + sai.entries = kmem_zalloc(sz, KM_NOFS);
KM_NOSLEEP, check for failure?
Otherwise looks ok.
-Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2017-11-09 2:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 1:03 [PATCH 0/5] xfs: various 4.15 scrub fixes Darrick J. Wong
2017-11-07 1:03 ` [PATCH 1/5] xfs: check the uniqueness of the AGFL entries Darrick J. Wong
2017-11-09 2:08 ` Dave Chinner [this message]
2017-11-09 2:48 ` Darrick J. Wong
2017-11-09 5:02 ` [PATCH v2 " Darrick J. Wong
2017-11-09 22:12 ` Darrick J. Wong
2017-11-09 23:39 ` [PATCH v3 " Darrick J. Wong
2017-11-10 1:23 ` Dave Chinner
2017-11-07 1:03 ` [PATCH 2/5] xfs: refactor the directory data block bestfree checks Darrick J. Wong
2017-11-09 2:11 ` Dave Chinner
2017-11-07 1:03 ` [PATCH 3/5] xfs: pass inode number to xfs_scrub_ino_set_{preen, warning} Darrick J. Wong
2017-11-09 2:13 ` Dave Chinner
2017-11-07 1:03 ` [PATCH 4/5] xfs: fix uninitialized return values in scrub code Darrick J. Wong
2017-11-09 2:13 ` Dave Chinner
2017-11-07 1:03 ` [PATCH 5/5] xfs: fix btree scrub deref check Darrick J. Wong
2017-11-09 2:16 ` Dave Chinner
2017-11-08 20:56 ` [PATCH 6/5] xfs: only check da node header padding on v5 filesystems Darrick J. Wong
2017-11-09 2:17 ` Dave Chinner
2017-11-09 6:00 ` [PATCH 7/5] xfs: on failed mount, force-reclaim inodes after unmounting quota controls Darrick J. Wong
2017-11-09 23:24 ` Dave Chinner
2017-11-09 23:49 ` Darrick J. Wong
2017-11-09 23:57 ` [PATCH v2 " Darrick J. Wong
2017-11-10 1:19 ` Dave Chinner
2017-11-09 17:35 ` [PATCH 8/5] xfs: remove u_int* type usage Darrick J. Wong
2017-11-09 23:25 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171109020829.GK4094@dastard \
--to=david@fromorbit.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).