Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

reiserfs: add check for invalid 1st journal block

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>

authored by

Pavel Skripkin and committed by
Jan Kara
a149127b 5b9fedb3

+14
+14
fs/reiserfs/journal.c
··· 2758 2758 goto free_and_return; 2759 2759 } 2760 2760 2761 + /* 2762 + * Sanity check to see if journal first block is correct. 2763 + * If journal first block is invalid it can cause 2764 + * zeroing important superblock members. 2765 + */ 2766 + if (!SB_ONDISK_JOURNAL_DEVICE(sb) && 2767 + SB_ONDISK_JOURNAL_1st_BLOCK(sb) < SB_JOURNAL_1st_RESERVED_BLOCK(sb)) { 2768 + reiserfs_warning(sb, "journal-1393", 2769 + "journal 1st super block is invalid: 1st reserved block %d, but actual 1st block is %d", 2770 + SB_JOURNAL_1st_RESERVED_BLOCK(sb), 2771 + SB_ONDISK_JOURNAL_1st_BLOCK(sb)); 2772 + goto free_and_return; 2773 + } 2774 + 2761 2775 if (journal_init_dev(sb, journal, j_dev_name) != 0) { 2762 2776 reiserfs_warning(sb, "sh-462", 2763 2777 "unable to initialize journal device");