From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 5/5] xfs: fix btree scrub deref check
Date: Mon, 06 Nov 2017 17:03:52 -0800 [thread overview]
Message-ID: <151001663224.26786.16638321559848220870.stgit@magnolia> (raw)
In-Reply-To: <151001660179.26786.15701876786383794673.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
The btree scrubber has some custom code to retrieve and check a btree
block via xfs_btree_lookup_get_block. This function will either return
an error code (verifiers failed) or a *pblock will be untouched (bad
pointer). Since we previously set *pblock to NULL, we need to check
*pblock, not pblock, to trigger the early bailout.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/scrub/btree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c
index a814404..df07661 100644
--- a/fs/xfs/scrub/btree.c
+++ b/fs/xfs/scrub/btree.c
@@ -335,7 +335,7 @@ xfs_scrub_btree_get_block(
error = xfs_btree_lookup_get_block(bs->cur, level, pp, pblock);
if (!xfs_scrub_btree_process_error(bs->sc, bs->cur, level, &error) ||
- !pblock)
+ !*pblock)
return error;
xfs_btree_get_block(bs->cur, level, pbp);
next prev parent reply other threads:[~2017-11-07 1:04 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
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 ` Darrick J. Wong [this message]
2017-11-09 2:16 ` [PATCH 5/5] xfs: fix btree scrub deref check 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=151001663224.26786.16638321559848220870.stgit@magnolia \
--to=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