[PATCH] ext4: fix kernel segfault after iterator overflow
From: Jan Henrik Weinstock
Date: Thu Jun 27 2024 - 04:56:36 EST
When search_buf gets placed at the end of the virtual address space
de = (struct ext4_dir_entry_2 *) ((char *) de + de_len);
might overflow to zero and a subsequent loop iteration will crash.
Observed on a simulated riscv32 system using 2GB of memory and a rootfs
on MMC.
Signed-off-by: Jan Henrik Weinstock <jan@xxxxxx>
---
fs/ext4/namei.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index a630b27a4..030a11412 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1537,7 +1537,8 @@ int ext4_search_dir(struct buffer_head *bh, char *search_buf, int buf_size,
de = (struct ext4_dir_entry_2 *)search_buf;
dlimit = search_buf + buf_size;
- while ((char *) de < dlimit - EXT4_BASE_DIR_LEN) {
+ while ((char *) de < dlimit - EXT4_BASE_DIR_LEN &&
+ (char *) de >= search_buf) {
/* this code is executed quadratically often */
/* do minimal checking `by hand' */
if (de->name + de->name_len <= dlimit &&
--
2.45.2