[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mm-commits
Subject:    [merged] reiserfs-add-check-for-an-invalid-ih_entry_count.patch removed from -mm
From:       akpm () linux-foundation ! org
Date:       2020-11-28 2:08:50
Message-ID: 20201128020850.xO-WawmxV%akpm () linux-foundation ! org
[Download RAW message or body]


The patch titled
     Subject: reiserfs: add check for an invalid ih_entry_count
has been removed from the -mm tree.  Its filename was
     reiserfs-add-check-for-an-invalid-ih_entry_count.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Rustam Kovhaev <rkovhaev@gmail.com>
Subject: reiserfs: add check for an invalid ih_entry_count

When a directory item has an invalid value set for ih_entry_count it might
trigger use-after-free or out-of-bounds read in bin_search_in_dir_item()

ih_entry_count * IH_SIZE for directory item should not be larger than
ih_item_len

Link: https://syzkaller.appspot.com/bug?extid=83b6f7cf9922cae5c4d7
Link: https://lkml.kernel.org/r/20201101140958.3650143-1-rkovhaev@gmail.com
Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com>
Reported-and-tested-by: syzbot+83b6f7cf9922cae5c4d7@syzkaller.appspotmail.com
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/reiserfs/stree.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/fs/reiserfs/stree.c~reiserfs-add-check-for-an-invalid-ih_entry_count
+++ a/fs/reiserfs/stree.c
@@ -454,6 +454,12 @@ static int is_leaf(char *buf, int blocks
 					 "(second one): %h", ih);
 			return 0;
 		}
+		if (is_direntry_le_ih(ih) && (ih_item_len(ih) < (ih_entry_count(ih) * IH_SIZE))) {
+			reiserfs_warning(NULL, "reiserfs-5093",
+					 "item entry count seems wrong %h",
+					 ih);
+			return 0;
+		}
 		prev_location = ih_location(ih);
 	}
 
_

Patches currently in -mm which might be from rkovhaev@gmail.com are


[prev in list] [next in list] [prev in thread] [next in thread]