call-journal-revoke-when-freeing-ea_inode-blocks

   1 ext4: call journal revoke when freeing ea_inode blocks
   2
   3 From: Tahsin Erdogan <tahsin@google.com>
   4
   5 ea_inode contents are treated as metadata, that's why it is journaled
   6 during initial writes. Failing to call revoke during freeing could cause
   7 user data to be overwritten with original ea_inode contents during journal
   8 replay.
   9
  10 Signed-off-by: Tahsin Erdogan <tahsin@google.com>
  11 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  12 ---
  13  fs/ext4/extents.c  | 3 ++-
  14  fs/ext4/indirect.c | 3 ++-
  15  2 files changed, 4 insertions(+), 2 deletions(-)
  16
  17 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
  18 index 3e36508610b7..e0a8425ff74d 100644
  19 --- a/fs/ext4/extents.c
  20 +++ b/fs/ext4/extents.c
  21 @@ -2488,7 +2488,8 @@ int ext4_ext_index_trans_blocks(struct inode *inode, int extents)
  22
  23  static inline int get_default_free_blocks_flags(struct inode *inode)
  24  {
  25 -       if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
  26 +       if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||
  27 +           ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE))
  28                 return EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET;
  29         else if (ext4_should_journal_data(inode))
  30                 return EXT4_FREE_BLOCKS_FORGET;
  31 diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
  32 index bc15c2c17633..7ffa290cbb8e 100644
  33 --- a/fs/ext4/indirect.c
  34 +++ b/fs/ext4/indirect.c
  35 @@ -829,7 +829,8 @@ static int ext4_clear_blocks(handle_t *handle, struct inode *inode,
  36         int     flags = EXT4_FREE_BLOCKS_VALIDATED;
  37         int     err;
  38
  39 -       if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
  40 +       if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode) ||
  41 +           ext4_test_inode_flag(inode, EXT4_INODE_EA_INODE))
  42                 flags |= EXT4_FREE_BLOCKS_FORGET | EXT4_FREE_BLOCKS_METADATA;
  43         else if (ext4_should_journal_data(inode))
  44                 flags |= EXT4_FREE_BLOCKS_FORGET;
  45 --
  46 2.13.1.611.g7e3b11ae1-goog
  47
  48