ext4: fix block validity checks for journal inodes using indirect blocks
authorTheodore Ts'o <tytso@mit.edu>
Wed, 15 May 2019 04:51:19 +0000 (00:51 -0400)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 11 Jun 2020 18:05:54 +0000 (19:05 +0100)
commita8a1d01018f66c5cc3cb2a4c194e55edcf0e50ec
treea0b5d1ff6aa561757ad3506900186fc06b2cc560
parent310dac05e090433b1de043eff9d0b0c389ba843f
ext4: fix block validity checks for journal inodes using indirect blocks

commit 170417c8c7bb2cbbdd949bf5c443c0c8f24a203b upstream.

Commit 345c0dbf3a30 ("ext4: protect journal inode's blocks using
block_validity") failed to add an exception for the journal inode in
ext4_check_blockref(), which is the function used by ext4_get_branch()
for indirect blocks.  This caused attempts to read from the ext3-style
journals to fail with:

[  848.968550] EXT4-fs error (device sdb7): ext4_get_branch:171: inode #8: block 30343695: comm jbd2/sdb7-8: invalid block

Fix this by adding the missing exception check.

Fixes: 345c0dbf3a30 ("ext4: protect journal inode's blocks using block_validity")
Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
[bwh: Backported to 3.16: Use EXT4_HAS_COMPAT_FEATURE]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/ext4/block_validity.c