Fix capability bound issue in ext2fs

CTSRD-CHERI · Jan 16, 2025 · b8752ed · b8752ed
1 parent 5a73626
commit b8752ed
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sys/fs/ext2fs/ext2_htree.c b/sys/fs/ext2fs/ext2_htree.c
@@ -300,7 +300,8 @@ ext2_htree_find_leaf(struct inode *ip, const char *name, int namelen,
 	if ((levels = rootp->h_info.h_ind_levels) > 1)
 		goto error;
 
-	entp = (struct ext2fs_htree_entry *)(((char *)&rootp->h_info) +
+	// Preserve capability bound here
+	entp = (struct ext2fs_htree_entry *)(((char *)rootp) + offsetof(struct ext2fs_htree_root, h_info) +
 	    rootp->h_info.h_info_len);
 
 	if (ext2_htree_get_limit(entp) !=