reiserfs: add check for an invalid ih_entry_count
PATCH 1/1 reiserfs: add check for an invalid ih_entry_count
when 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
Reported-and-tested-by [email protected]
Signed-off-by Rustam Kovhaev <[email protected]>
--- fs/reiserfs/stree.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/reiserfs/stree.c +6 -0
@@ -454,6 +454,12 @@ static int is_leaf(char *buf, int blocksize, struct buffer_head *bh) "(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); }
Signature · 1 line
2.28.0
Quoted 9 lines · Rustam Kovhaev
when directory item has an invalid value set for
ih_entry_countit might trigger use-after-free or out-of-bounds read inbin_search_in_dir_item()
ih_entry_count*IH_SIZEfor directory item should not be larger thanih_item_lenReported-and-tested-by [email protected]Signed-off-by Rustam Kovhaev <[email protected]>
Thanks! I've added the patch to my tree and will push it to Linus.
Honza
Quoted 24 lines
--- fs/reiserfs/stree.c | 6 ++++++ 1 file changed, 6 insertions(+)fs/reiserfs/stree.c +6
-0@@ -454,6 +454,12 @@ static int is_leaf(char *buf, int blocksize, struct buffer_head *bh) "(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); }Signature · 1 line
2.28.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR