ext4: mark inode dirty after converting inline directory
PATCH 1/1 ext4: mark inode dirty after converting inline directory
From: Eric Biggers <[email protected]>
If ext4_convert_inline_data() was called on a directory with inline data, the filesystem was left in an inconsistent state (as considered by e2fsck) because the file size was not increased to cover the new block. This happened because the inode was not marked dirty after i_disksize was updated. Fix this by marking the inode dirty at the end of ext4_finish_convert_inline_dir().
This bug was probably not noticed before because most users mark the inode dirty afterwards for other reasons. But if userspace executed FS_IOC_SET_ENCRYPTION_POLICY with invalid parameters, as exercised by 'kvm-xfstests -c adv generic/396', then the inode was never marked dirty after updating i_disksize.
--- fs/ext4/inline.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/ext4/inline.c +2 -3
@@ -1169,10 +1169,9 @@ static int ext4_finish_convert_inline_dir(handle_t *handle,set_buffer_uptodate (dir_block); err =ext4_handle_dirty_dirent_node (handle, inode, dir_block);if (err) - goto out; +return err;set_buffer_verified (dir_block); -out: -return err; +return ext4_mark_inode_dirty (handle, inode); } static int ext4_convert_inline_data_nolock(handle_t *handle,
Signature · 1 line
2.11.0.483.g087da7b7c-goog
Quoted 9 lines · Eric Biggers
From: Eric Biggers <[email protected]>
If
ext4_convert_inline_data()was called on a directory with inline data, the filesystem was left in an inconsistent state (as considered by e2fsck) because the file size was not increased to cover the new block. This happened because the inode was not marked dirty afteri_disksizewas updated. Fix this by marking the inode dirty at the end ofext4_finish_convert_inline_dir().
Quoted 8 lines
This bug was probably not noticed before because most users mark the inode dirty afterwards for other reasons. But if userspace executed
FS_IOC_SET_ENCRYPTION_POLICYwith invalid parameters, as exercised by 'kvm-xfstests -c adv generic/396', then the inode was never marked dirty after updatingi_disksize.Signed-off-by Eric Biggers <[email protected]>
Applied, thanks.
- Ted
Quoted 9 lines · Eric Biggers
From: Eric Biggers <[email protected]>
If
ext4_convert_inline_data()was called on a directory with inline data, the filesystem was left in an inconsistent state (as considered by e2fsck) because the file size was not increased to cover the new block. This happened because the inode was not marked dirty afteri_disksizewas updated. Fix this by marking the inode dirty at the end ofext4_finish_convert_inline_dir().
Quoted 8 lines
This bug was probably not noticed before because most users mark the inode dirty afterwards for other reasons. But if userspace executed
FS_IOC_SET_ENCRYPTION_POLICYwith invalid parameters, as exercised by 'kvm-xfstests -c adv generic/396', then the inode was never marked dirty after updatingi_disksize.Signed-off-by Eric Biggers <[email protected]>
Thanks, applied.
- Ted