Skip to contentSkip to conversation

reiserfs: add check for an invalid ih_entry_count

PATCH Applied Rustam Kovhaev 2 participants 2 messages Nov 1, 2020 – Nov 26, 2020

lore
Share & tools
lore
#0 lore raw

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

---
 fs/reiserfs/stree.c | 6 ++++++
 1 file changed, 6 insertions(+)
fs/reiserfs/stree.c +6 -0
index 8bf88d690729..476a7ff49482 100644
@@ -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
#1 lore raw
Quoted 9 lines · Rustam Kovhaev

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

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
index 8bf88d690729..476a7ff49482 100644
@@ -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