Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddfa17e4 authored by Tahsin Erdogan's avatar Tahsin Erdogan Committed by Theodore Ts'o
Browse files

ext4: call journal revoke when freeing ea_inode blocks 



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: default avatarTahsin Erdogan <tahsin@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 9e1ba001

fs/ext4/extents.c

+2 −1
Original line number Diff line number Diff line
@@ -2488,7 +2488,8 @@ int ext4_ext_index_trans_blocks(struct inode *inode, int extents) 


static inline int get_default_free_blocks_flags(struct inode *inode)

{

	if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))

	if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||

	    ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE))

		return EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET;

	else if (ext4_should_journal_data(inode))

		return EXT4_FREE_BLOCKS_FORGET;

fs/ext4/indirect.c

+2 −1
Original line number Diff line number Diff line
@@ -829,7 +829,8 @@ static int ext4_clear_blocks(handle_t *handle, struct inode *inode, 
	int	flags = EXT4_FREE_BLOCKS_VALIDATED;

	int	err;



	if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))

	if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||

	    ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE))

		flags |= EXT4_FREE_BLOCKS_FORGET | EXT4_FREE_BLOCKS_METADATA;

	else if (ext4_should_journal_data(inode))

		flags |= EXT4_FREE_BLOCKS_FORGET;