From: Ritesh Harjani <riteshh@linux.ibm.com>
To: linux-ext4@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, "Theodore Ts'o" <tytso@mit.edu>,
Jan Kara <jack@suse.cz>,
Harshad Shirwadkar <harshadshirwadkar@gmail.com>,
Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [PATCHv1 9/9] ext4: Add extra check in ext4_mb_mark_bb() to prevent against possible corruption
Date: Sat, 5 Feb 2022 19:39:58 +0530 [thread overview]
Message-ID: <50eb09dbf5d8d67c7edb0a4c0146e184cf4e2ed0.1644062450.git.riteshh@linux.ibm.com> (raw)
In-Reply-To: <cover.1644062450.git.riteshh@linux.ibm.com>
This patch adds an extra checks in ext4_mb_mark_bb() function
to make sure we mark & report error if we were to mark/clear any
of the critical FS metadata specific bitmaps (&bail out) to prevent
from any accidental corruption.
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
fs/ext4/mballoc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 9f2b3a057918..75c20a10529a 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3918,6 +3918,14 @@ void ext4_mb_mark_bb(struct super_block *sb, ext4_fsblk_t block,
EXT4_BLOCKS_PER_GROUP(sb) - EXT4_C2B(sbi, blkoff));
clen = EXT4_NUM_B2C(sbi, thisgrp_len);
+ if (!ext4_sb_block_valid(sb, NULL, block, thisgrp_len)) {
+ ext4_error(sb, "Marking blocks in system zone - "
+ "Block = %llu, len = %u",
+ block, thisgrp_len);
+ bitmap_bh = NULL;
+ break;
+ }
+
bitmap_bh = ext4_read_block_bitmap(sb, group);
if (IS_ERR(bitmap_bh)) {
err = PTR_ERR(bitmap_bh);
--
2.31.1
next prev parent reply other threads:[~2022-02-05 14:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 14:09 [PATCHv1 0/9] ext4: fast_commit fixes, stricter block checking & cleanups Ritesh Harjani
2022-02-05 14:09 ` [PATCHv1 1/9] ext4: Correct cluster len and clusters changed accounting in ext4_mb_mark_bb Ritesh Harjani
2022-02-07 15:28 ` Jan Kara
2022-02-05 14:09 ` [PATCHv1 2/9] ext4: Fixes ext4_mb_mark_bb() with flex_bg with fast_commit Ritesh Harjani
2022-02-07 16:37 ` Jan Kara
2022-02-08 3:11 ` Ritesh Harjani
2022-02-08 9:59 ` Jan Kara
2022-02-05 14:09 ` [PATCHv1 3/9] ext4: Refactor ext4_free_blocks() to pull out ext4_mb_clear_bb() Ritesh Harjani
2022-02-05 14:09 ` [PATCHv1 4/9] ext4: Use in_range() for range checking in ext4_fc_replay_check_excluded Ritesh Harjani
2022-02-05 14:09 ` [PATCHv1 5/9] ext4: Rename ext4_set_bits to mb_set_bits Ritesh Harjani
2022-02-07 16:38 ` Jan Kara
2022-02-05 14:09 ` [PATCHv1 6/9] ext4: No need to test for block bitmap bits in ext4_mb_mark_bb() Ritesh Harjani
2022-02-05 14:09 ` [PATCHv1 7/9] ext4: Add ext4_sb_block_valid() refactored out of ext4_inode_block_valid() Ritesh Harjani
2022-02-07 16:42 ` Jan Kara
2022-02-08 3:03 ` Ritesh Harjani
2022-02-05 14:09 ` [PATCHv1 8/9] ext4: Add strict range checks while freeing blocks Ritesh Harjani
2022-02-07 16:44 ` Jan Kara
2022-02-05 14:09 ` Ritesh Harjani [this message]
2022-02-07 16:45 ` [PATCHv1 9/9] ext4: Add extra check in ext4_mb_mark_bb() to prevent against possible corruption Jan Kara
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=50eb09dbf5d8d67c7edb0a4c0146e184cf4e2ed0.1644062450.git.riteshh@linux.ibm.com \
--to=riteshh@linux.ibm.com \
--cc=harshadshirwadkar@gmail.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=tytso@mit.edu \
/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).