From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 14 Nov 2011 14:52:08 +0000 (+0300)
Subject: hfs: add sanity check for file name length
X-Git-Tag: MMI-PSA29.97-13-9~18033
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc5b8a9003132ae44559edd63a1623b7b99dfb68;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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) {