diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-11-14 17:52:08 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-21 14:31:18 -0800 |
commit | 3bbea6b4bca6ac2529fbbb71e58323a00592edae (patch) | |
tree | a15be936d24cf1e1efe2db80c18b36d67307985f | |
parent | 31a05f7dd79da9b4889008847e2a851835c14269 (diff) | |
download | lwn-3bbea6b4bca6ac2529fbbb71e58323a00592edae.tar.gz lwn-3bbea6b4bca6ac2529fbbb71e58323a00592edae.zip |
hfs: add sanity check for file name length
commit bc5b8a9003132ae44559edd63a1623b7b99dfb68 upstream.
On a corrupted file system the ->len field could be wrong leading to
a buffer overflow.
Reported-and-acked-by: Clement LECIGNE <clement.lecigne@netasq.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | fs/hfs/trans.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c index e673a88b8ae7..b1ce4c7ad3fb 100644 --- a/fs/hfs/trans.c +++ b/fs/hfs/trans.c @@ -40,6 +40,8 @@ int hfs_mac2asc(struct super_block *sb, char *out, const struct hfs_name *in) src = in->name; srclen = in->len; + if (srclen > HFS_NAMELEN) + srclen = HFS_NAMELEN; dst = out; dstlen = HFS_MAX_NAMELEN; if (nls_io) { |