summaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-11-14 15:52:08 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-15 17:29:42 +0100
commitbc5b8a9003132ae44559edd63a1623b7b99dfb68 (patch)
treee5dd06f9262c13daaa3d09f643572f909ba2cdbd /fs/hfs
parentMerge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh (diff)
downloadlinux-bc5b8a9003132ae44559edd63a1623b7b99dfb68.tar.xz
linux-bc5b8a9003132ae44559edd63a1623b7b99dfb68.zip
hfs: add sanity check for file name length
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> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/trans.c2
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) {