aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2021-08-04 14:23:55 -0400
committerTheodore Ts'o <tytso@mit.edu>2021-08-06 13:00:49 -0400
commit877ba3f729fd3d8ef0e29bc2a55e57cfa54b2e43 (patch)
tree328a762b42f428b120c842d85e49a83618265789 /fs
parentext4: remove conflicting comment from __ext4_forget (diff)
downloadlinux-dev-877ba3f729fd3d8ef0e29bc2a55e57cfa54b2e43.tar.xz
linux-dev-877ba3f729fd3d8ef0e29bc2a55e57cfa54b2e43.zip
ext4: fix potential htree corruption when growing large_dir directories
Commit b5776e7524af ("ext4: fix potential htree index checksum corruption) removed a required restart when multiple levels of index nodes need to be split. Fix this to avoid directory htree corruptions when using the large_dir feature. Cc: stable@kernel.org # v5.11 Cc: Благодаренко Артём <artem.blagodarenko@gmail.com> Fixes: b5776e7524af ("ext4: fix potential htree index checksum corruption) Reported-by: Denis <denis@voxelsoft.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5fd56f616cf0..f3bbcd4efb56 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2517,7 +2517,7 @@ again:
goto journal_error;
err = ext4_handle_dirty_dx_node(handle, dir,
frame->bh);
- if (err)
+ if (restart || err)
goto journal_error;
} else {
struct dx_root *dxroot;