ext4: call journal revoke when freeing ea_inode blocks

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

kernel os linux

ea_inode contents are treated as metadata, that's why it is journaled
during initial writes. Failing to call revoke during freeing could cause
user data to be overwritten with original ea_inode contents during journal
replay.

Signed-off-by: Tahsin Erdogan <tahsin@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Tahsin Erdogan and committed by

Theodore Ts'o 8 years ago ddfa17e4 9e1ba001

+4 -2

2 changed files

expand all

ext4

extents.c

indirect.c

+2 -1

fs/ext4/extents.c

··· 2488 2488 2489 2489 static inline int get_default_free_blocks_flags(struct inode *inode) 2490 2490 { 2491 - if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) 2491 + if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) || 2492 + ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE)) 2492 2493 return EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET; 2493 2494 else if (ext4_should_journal_data(inode)) 2494 2495 return EXT4_FREE_BLOCKS_FORGET;

+2 -1

fs/ext4/indirect.c

··· 829 829 int flags = EXT4_FREE_BLOCKS_VALIDATED; 830 830 int err; 831 831 832 - if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) 832 + if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) || 833 + ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE)) 833 834 flags |= EXT4_FREE_BLOCKS_FORGET | EXT4_FREE_BLOCKS_METADATA; 834 835 else if (ext4_should_journal_data(inode)) 835 836 flags |= EXT4_FREE_BLOCKS_FORGET;