This is a note to let you know that I've just added the patch titled
ext4: fix block validity checks for journal inodes using indirect blocks
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-fix-block-validity-checks-for-journal-inodes-using-indirect-blocks.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 170417c8c7bb2cbbdd949bf5c443c0c8f24a203b Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@xxxxxxx>
Date: Wed, 15 May 2019 00:51:19 -0400
Subject: ext4: fix block validity checks for journal inodes using indirect blocks
From: Theodore Ts'o <tytso@xxxxxxx>
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@xxxxxxxxxxxxxxxx>
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Ashwin H <ashwinh@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/ext4/block_validity.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -274,6 +274,11 @@ int ext4_check_blockref(const char *func
__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 &&
Patches currently in stable-queue which might be from tytso@xxxxxxx are
queue-4.4/ext4-avoid-declaring-fs-inconsistent-due-to-invalid-file-handles.patch
queue-4.4/ext4-protect-journal-inode-s-blocks-using-block_validity.patch
queue-4.4/ext4-convert-bug_on-s-to-warn_on-s-in-mballoc.c.patch
queue-4.4/ext4-unsigned-int-compared-against-zero.patch
queue-4.4/ext4-fix-block-validity-checks-for-journal-inodes-using-indirect-blocks.patch
queue-4.4/ext4-fix-extent_status-fragmentation-for-plain-files.patch
queue-4.4/ext4-don-t-perform-block-validity-checks-on-the-journal-inode.patch
