Skip to contentSkip to conversation

libext2fs: ensure validate_entry doesn't read beyond blocksize

PATCH Applied number9652 2 participants 2 messages Jun 12, 2009 – Jun 29, 2009

lore
Share & tools
lore

number9652

author
#0 lore raw

PATCH 1/1 libext2fs: ensure validate_entry doesn't read beyond blocksize

ext2fs_validate_entry would read beyond the end of the block to get dirent->rec_len for certain arguments (like if blocksize == final_offset). This patch adds a check so that doesn't happen, and changes the types of the arguments to avoid a compiler warning.

e2fsprogs-1.41.5/lib/ext2fs/dir_iterate.c renamed from e2fsprogs-1.41.5-orig/lib/ext2fs/dir_iterate.c +5 -3
index 1f8cf8f..6be066c 100644
@@ -29,13 +29,15 @@
  * undeleted entry.  Returns 1 if the deleted entry looks valid, zero
  * if not valid.
  */
-static int ext2fs_validate_entry(ext2_filsys fs, char *buf, int offset,
-				 int final_offset)
+static int ext2fs_validate_entry(ext2_filsys fs, char *buf,
+				 unsigned int offset,
+				 unsigned int final_offset)
 {
 	struct ext2_dir_entry *dirent;
 	int	rec_len;
+	int dirent_min_len = 12;
 
-	while (offset < final_offset) {
+	while (offset < final_offset &&	offset <= fs->blocksize - dirent_min_len) {
 		dirent = (struct ext2_dir_entry *)(buf + offset);
 		rec_len = (dirent->rec_len || fs->blocksize < 65536) ?
 			dirent->rec_len : 65536;
Applied
#1 lore raw
Quoted 4 lines · On Fri, Jun 12, 2009 at 09:04:32AM -0700, number9652 wrote:

ext2fs_validate_entry would read beyond the end of the block to get dirent->rec_len for certain arguments (like if blocksize == final_offset). This patch adds a check so that doesn't happen, and changes the types of the arguments to avoid a compiler warning.

Applied. In the future, please line-wrap the body of the commit message at 72-75 characters.

I also lined up the arguments to ext2fs_validate_entry on the continuation line, and used a CPP macro instead of an automatic variable for dirent_min_length.

- Ted