aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fat
diff options
context:
space:
mode:
authorNamjae Jeon <linkinjeon@gmail.com>2012-03-23 18:02:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-23 19:58:40 -0400
commitd533df07c20c7b59b0559a3ac38fb45c81ffd6bb (patch)
tree7b6746dd28654291742a455d46726c0bac461860 /fs/fat
parent41f0c02eacec9f984adb22e8fecda49e13b7eb13 (diff)
fat: fix bug in enforcing Long File Name length
Since '*outlen' is initialized to zero, it is currently possible to create a filename of length (FAT_LFN_LEN + 1) when utf8 is not enabled. To enforce the FAT_LFN_LEN limit, we must perform one less iteration. Signed-off-by: Namjae Jeon <linkinjeon@gmail.com> Signed-off-by: Ravishankar N <cyberax82@gmail.com> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fat')
-rw-r--r--fs/fat/namei_vfat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index aae3b4e1057d..98ae804f5273 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -522,7 +522,7 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
522 op = &outname[*outlen * sizeof(wchar_t)]; 522 op = &outname[*outlen * sizeof(wchar_t)];
523 } else { 523 } else {
524 for (i = 0, ip = name, op = outname, *outlen = 0; 524 for (i = 0, ip = name, op = outname, *outlen = 0;
525 i < len && *outlen <= FAT_LFN_LEN; 525 i < len && *outlen < FAT_LFN_LEN;
526 *outlen += 1) { 526 *outlen += 1) {
527 if (escape && (*ip == ':')) { 527 if (escape && (*ip == ':')) {
528 if (i > len - 5) 528 if (i > len - 5)