From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: xfs <linux-xfs@vger.kernel.org>
Cc: Dave Chinner <david@fromorbit.com>
Subject: [PATCH v2] xfs: don't crash when read verifier reports errors with null b_ops
Date: Tue, 15 Jan 2019 14:42:56 -0800 [thread overview]
Message-ID: <20190115224256.GF12689@magnolia> (raw)
In-Reply-To: <20190115170820.GB12689@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
In xrep_findroot_block, we work out the btree type and correctness of a
given block by calling different btree verifiers on root block
candidates. However, we leave the NULL b_ops while ->verify_read
validates the block, which means that if the verifier calls
xfs_buf_verifier_error it'll crash on the null b_ops. Fix it to avoid
this crash.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
v2: leave a comment about what we're doing above the function
---
fs/xfs/xfs_error.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 9866f542e77b..6e80e438b27a 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -340,6 +340,9 @@ xfs_corruption_error(
/*
* Warnings specifically for verifier errors. Differentiate CRC vs. invalid
* values, and omit the stack trace unless the error level is tuned high.
+ *
+ * NOTE: Some callers might be calling the verifiers directly (rather than
+ * through the b_ops structure) so bp->b_ops may be NULL.
*/
void
xfs_buf_verifier_error(
@@ -359,7 +362,7 @@ xfs_buf_verifier_error(
xfs_alert(mp, "Metadata %s detected at %pS, %s block 0x%llx %s",
bp->b_error == -EFSBADCRC ? "CRC error" : "corruption",
- fa, bp->b_ops->name, bp->b_bn, name);
+ fa, bp->b_ops ? bp->b_ops->name : "unknown", bp->b_bn, name);
xfs_alert(mp, "Unmount and run xfs_repair");
next prev parent reply other threads:[~2019-01-15 22:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-15 17:08 [PATCH] xfs: don't crash when read verifier reports errors with null b_ops Darrick J. Wong
2019-01-15 20:23 ` Dave Chinner
2019-01-15 22:38 ` Darrick J. Wong
2019-01-15 22:42 ` Darrick J. Wong [this message]
2019-01-18 5:04 ` [PATCH v2] " 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=20190115224256.GF12689@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.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