mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
reiserfs: add check for invalid 1st journal block
[ Upstream commit a149127be5
]
syzbot reported divide error in reiserfs.
The problem was in incorrect journal 1st block.
Syzbot's reproducer manualy generated wrong superblock
with incorrect 1st block. In journal_init() wasn't
any checks about this particular case.
For example, if 1st journal block is before superblock
1st block, it can cause zeroing important superblock members
in do_journal_end().
Link: https://lore.kernel.org/r/20210517121545.29645-1-paskripkin@gmail.com
Reported-by: syzbot+0ba9909df31c6a36974d@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a5f688a13a
commit
f565c1e7c8
1 changed files with 14 additions and 0 deletions
|
@ -2769,6 +2769,20 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
|
||||||
goto free_and_return;
|
goto free_and_return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Sanity check to see if journal first block is correct.
|
||||||
|
* If journal first block is invalid it can cause
|
||||||
|
* zeroing important superblock members.
|
||||||
|
*/
|
||||||
|
if (!SB_ONDISK_JOURNAL_DEVICE(sb) &&
|
||||||
|
SB_ONDISK_JOURNAL_1st_BLOCK(sb) < SB_JOURNAL_1st_RESERVED_BLOCK(sb)) {
|
||||||
|
reiserfs_warning(sb, "journal-1393",
|
||||||
|
"journal 1st super block is invalid: 1st reserved block %d, but actual 1st block is %d",
|
||||||
|
SB_JOURNAL_1st_RESERVED_BLOCK(sb),
|
||||||
|
SB_ONDISK_JOURNAL_1st_BLOCK(sb));
|
||||||
|
goto free_and_return;
|
||||||
|
}
|
||||||
|
|
||||||
if (journal_init_dev(sb, journal, j_dev_name) != 0) {
|
if (journal_init_dev(sb, journal, j_dev_name) != 0) {
|
||||||
reiserfs_warning(sb, "sh-462",
|
reiserfs_warning(sb, "sh-462",
|
||||||
"unable to initialize journal device");
|
"unable to initialize journal device");
|
||||||
|
|
Loading…
Reference in a new issue