Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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: Tahsin Erdogan <tahsin@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Tahsin Erdogan 8 years ago
parent
9e1ba00161
commit
ddfa17e4ad
2 changed files with 4 additions and 2 deletions
Split View Show Diff Stats
  1. 2 1
      fs/ext4/extents.c
  2. 2 1
      fs/ext4/indirect.c

+ 2 - 1
fs/ext4/extents.c
View File 

@@ -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;

+ 2 - 1
fs/ext4/indirect.c
View File 

@@ -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;