From: Baokun Li Date: Sat, 7 Jan 2023 03:21:26 +0000 (+0800) Subject: ext4: update s_journal_inum if it changes after journal replay X-Git-Tag: baikal/mips/sdk6.1~95 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=688f6e0c51abc22cd2973965a1b7309c6b29c97b;p=kernel.git ext4: update s_journal_inum if it changes after journal replay [ Upstream commit 37e7b68bb2b2465a565c4987f36a84980da148ac ] When mounting a crafted ext4 image, s_journal_inum may change after journal replay, which is obviously unreasonable because we have successfully loaded and replayed the journal through the old s_journal_inum. And the new s_journal_inum bypasses some of the checks in ext4_get_journal(), which may trigger a null pointer dereference problem. So if s_journal_inum changes after the journal replay, we ignore the change, and rewrite the current journal_inum to the superblock. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216541 Reported-by: Luís Henriques Signed-off-by: Baokun Li Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20230107032126.4165860-3-libaokun1@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 8011600999586..2528e8216c334 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5967,8 +5967,11 @@ static int ext4_load_journal(struct super_block *sb, if (!really_read_only && journal_devnum && journal_devnum != le32_to_cpu(es->s_journal_dev)) { es->s_journal_dev = cpu_to_le32(journal_devnum); - - /* Make sure we flush the recovery flag to disk. */ + ext4_commit_super(sb); + } + if (!really_read_only && journal_inum && + journal_inum != le32_to_cpu(es->s_journal_inum)) { + es->s_journal_inum = cpu_to_le32(journal_inum); ext4_commit_super(sb); }