diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-05-15 00:51:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-16 08:22:24 +0200 |
| commit | 292666d2d868f30a55f6d5f15c5a1a16a38a99c5 (patch) | |
| tree | 0b0547a9f4a80d891a7dcc2fa5411eef0bd6fcc8 /fs | |
| parent | 97fbf573460e56ddf172614f70cdfa2af03b20ea (diff) | |
| download | linux-stable-292666d2d868f30a55f6d5f15c5a1a16a38a99c5.tar.gz linux-stable-292666d2d868f30a55f6d5f15c5a1a16a38a99c5.tar.bz2 linux-stable-292666d2d868f30a55f6d5f15c5a1a16a38a99c5.zip | |
ext4: fix block validity checks for journal inodes using indirect blocks
[ Upstream commit 170417c8c7bb2cbbdd949bf5c443c0c8f24a203b ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/block_validity.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c index 9409b1e11a22..cd7129b622f8 100644 --- a/fs/ext4/block_validity.c +++ b/fs/ext4/block_validity.c @@ -275,6 +275,11 @@ int ext4_check_blockref(const char *function, unsigned int line, __le32 *bref = p; unsigned int blk; + if (ext4_has_feature_journal(inode->i_sb) && + (inode->i_ino == + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_journal_inum))) + return 0; + while (bref < p+max) { blk = le32_to_cpu(*bref++); if (blk && |