From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: abuchbinder@google.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 2/5] e2fsck: don't restart after a critical metadata collision in e2fsck -n mode
Date: Sun, 23 Jul 2017 00:50:32 -0400 [thread overview]
Message-ID: <20170723045035.26019-2-tytso@mit.edu> (raw)
In-Reply-To: <20170723045035.26019-1-tytso@mit.edu>
If the file system isn't going to be changed, there's no point
restarting; it will just cause e2fsck to loop forever.
This problem was found using American Fuzzy Lop.
Reported-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
e2fsck/pass1.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index c358eec0f..8044beed6 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2718,7 +2718,8 @@ report_problem:
fix_problem(ctx,
PR_1_CRITICAL_METADATA_COLLISION,
pctx);
- ctx->flags |= E2F_FLAG_RESTART_LATER;
+ if ((ctx->options & E2F_OPT_NO) == 0)
+ ctx->flags |= E2F_FLAG_RESTART_LATER;
}
pctx->errcode = ext2fs_extent_get(ehandle,
EXT2_EXTENT_DOWN, &extent);
@@ -3453,7 +3454,8 @@ static int process_block(ext2_filsys fs,
ext2fs_test_block_bitmap2(ctx->block_metadata_map, blk)) {
pctx->blk = blk;
fix_problem(ctx, PR_1_CRITICAL_METADATA_COLLISION, pctx);
- ctx->flags |= E2F_FLAG_RESTART_LATER;
+ if ((ctx->options & E2F_OPT_NO) == 0)
+ ctx->flags |= E2F_FLAG_RESTART_LATER;
}
if (problem) {
--
2.11.0.rc0.7.gbe5a750
next prev parent reply other threads:[~2017-07-23 4:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-23 4:50 [PATCH 1/5] e2fsck: quiet some harmless bitmap warnings Theodore Ts'o
2017-07-23 4:50 ` Theodore Ts'o [this message]
2017-07-23 4:50 ` [PATCH 3/5] libext2fs: add stricter checks on the inode size in ext2fs_open2() Theodore Ts'o
2017-07-23 4:50 ` [PATCH 4/5] debugfs: add sanity checking to the string_to_inode() utility function Theodore Ts'o
2017-07-23 4:50 ` [PATCH 5/5] resize2fs: sanity check the free blocks and inode counts Theodore Ts'o
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=20170723045035.26019-2-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=abuchbinder@google.com \
--cc=linux-ext4@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).