summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2021-08-04 14:23:55 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-08-12 13:19:43 +0200
commitbc1954aa8a7e195ebd686a77e81c11863ce8edbf (patch)
treebcf48bd3640247451954eefebcbb04a1e2e7f9a2 /fs
parent76ccb26c5312760113b2b3ef6de307474e8d4b45 (diff)
downloadlinux-stable-bc1954aa8a7e195ebd686a77e81c11863ce8edbf.tar.gz
linux-stable-bc1954aa8a7e195ebd686a77e81c11863ce8edbf.tar.bz2
linux-stable-bc1954aa8a7e195ebd686a77e81c11863ce8edbf.zip
ext4: fix potential htree corruption when growing large_dir directories
commit 877ba3f729fd3d8ef0e29bc2a55e57cfa54b2e43 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 358f6378882f..797fe41d071f 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2317,7 +2317,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;