diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2008-10-16 07:04:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 20:21:46 +0200 |
| commit | d38b7aa7fc3371b52d036748028db50b585ade2e (patch) | |
| tree | fd4193112378362a5c12999d467bdaaf8875d1b0 /fs/hfs/catalog.c | |
| parent | hfsplus: check read_mapping_page() return value (diff) | |
| download | linux-d38b7aa7fc3371b52d036748028db50b585ade2e.tar.xz linux-d38b7aa7fc3371b52d036748028db50b585ade2e.zip | |
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>
Diffstat (limited to 'fs/hfs/catalog.c')
| -rw-r--r-- | fs/hfs/catalog.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c index ba851576ebb1..6d98f116ca03 100644 --- a/fs/hfs/catalog.c +++ b/fs/hfs/catalog.c @@ -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); } |