Commit d38b7aa7 authored Oct 15, 2008 by Eric Sesterhenn Committed by Linus Torvalds Oct 16, 2008

hfs: fix namelength memory corruption



Fix a stack corruption caused by a corrupted hfs filesystem.  If the
catalog name length is corrupted the memcpy overwrites the catalog btree
structure.  Since the field is limited to HFS_NAMELEN bytes in the
structure and the file format, we throw an error if it is too long.

Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 649f1ee6

fs/hfs/catalog.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,10 @@ int hfs_cat_find_brec(struct super_block *sb, u32 cnid,

		fd->search_key->cat.ParID = rec.thread.ParID;
		len = fd->search_key->cat.CName.len = rec.thread.CName.len;
		if (len > HFS_NAMELEN) {
		printk(KERN_ERR "hfs: bad catalog namelength\n");
		return -EIO;
		}
		memcpy(fd->search_key->cat.CName.name, rec.thread.CName.name, len);
		return hfs_brec_find(fd);
		}