Commit c115fc1d authored by Hirofumi Ogawa's avatar Hirofumi Ogawa Committed by Linus Torvalds

[PATCH] fat: Return better error codes from vfat_valid_longname()

From Rene Scharfe <rene.scharfe@lsrfire.ath.cx>

Fix error code.
Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 24d4a912
...@@ -189,10 +189,10 @@ static inline int vfat_is_used_badchars(const wchar_t *s, int len) ...@@ -189,10 +189,10 @@ static inline int vfat_is_used_badchars(const wchar_t *s, int len)
static int vfat_valid_longname(const unsigned char *name, unsigned int len) static int vfat_valid_longname(const unsigned char *name, unsigned int len)
{ {
if (len && name[len-1] == ' ') if (name[len - 1] == ' ')
return 0; return -EINVAL;
if (len >= 256) if (len >= 256)
return 0; return -ENAMETOOLONG;
/* MS-DOS "device special files" */ /* MS-DOS "device special files" */
if (len == 3 || (len > 3 && name[3] == '.')) { /* basename == 3 */ if (len == 3 || (len > 3 && name[3] == '.')) { /* basename == 3 */
...@@ -200,18 +200,18 @@ static int vfat_valid_longname(const unsigned char *name, unsigned int len) ...@@ -200,18 +200,18 @@ static int vfat_valid_longname(const unsigned char *name, unsigned int len)
!strnicmp(name, "con", 3) || !strnicmp(name, "con", 3) ||
!strnicmp(name, "nul", 3) || !strnicmp(name, "nul", 3) ||
!strnicmp(name, "prn", 3)) !strnicmp(name, "prn", 3))
return 0; return -EINVAL;
} }
if (len == 4 || (len > 4 && name[4] == '.')) { /* basename == 4 */ if (len == 4 || (len > 4 && name[4] == '.')) { /* basename == 4 */
/* "com1", "com2", ... */ /* "com1", "com2", ... */
if ('1' <= name[3] && name[3] <= '9') { if ('1' <= name[3] && name[3] <= '9') {
if (!strnicmp(name, "com", 3) || if (!strnicmp(name, "com", 3) ||
!strnicmp(name, "lpt", 3)) !strnicmp(name, "lpt", 3))
return 0; return -EINVAL;
} }
} }
return 1; return 0;
} }
static int vfat_find_form(struct inode *dir, unsigned char *name) static int vfat_find_form(struct inode *dir, unsigned char *name)
...@@ -614,8 +614,9 @@ static int vfat_build_slots(struct inode *dir, const unsigned char *name, ...@@ -614,8 +614,9 @@ static int vfat_build_slots(struct inode *dir, const unsigned char *name,
loff_t offset; loff_t offset;
*slots = 0; *slots = 0;
if (!vfat_valid_longname(name, len)) res = vfat_valid_longname(name, len);
return -EINVAL; if (res)
return res;
if(!(page = __get_free_page(GFP_KERNEL))) if(!(page = __get_free_page(GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment