Keith Mok <[EMAIL PROTECTED]> writes:
> This patch fix the problem that the buffer allocated for convert of
> unicode to utf8 in fat/dir.c is too small.
> And cannot handle filename with 255 asian characters when mounted with
> utf8 options.
>
> Also it fix the filename length limitation checking in vfat/namei.c that
> the filename length should be checked against the number of converted
> unicode characters.
> Not the length before NLS/UTF8 converted.
>
> Any comments ?
Looks good. But it seems to have some problems.
And we will need cleanup the original code related this
patch. Unfortunately, it's really dirty although unrelated to this
patch.
> --- linux-source-2.6.22/fs/vfat/namei.c.orig 2007-07-09 07:32:17.000000000
> +0800
> +++ linux-source-2.6.22/fs/vfat/namei.c 2008-02-13 22:56:14.000000000
> +0800
> @@ -176,15 +176,8 @@ static inline int vfat_is_used_badchars(
> for (i = 0; i < len; i++)
> if (vfat_bad_char(s[i]))
> return -EINVAL;
> - return 0;
> -}
> -
> -static int vfat_valid_longname(const unsigned char *name, unsigned int len)
> -{
> - if (name[len - 1] == ' ')
> + if(s[i-1] == 0x0020) /* last character cannot be space */
Please use the following style. (See Documentation/CodingStyle)
if (s[i - 1] == 0x0020)
> @@ -489,7 +482,7 @@ xlate_to_uni(const unsigned char *name,
> } else {
> if (nls) {
> for (i = 0, ip = name, op = outname, *outlen = 0;
> - i < len && *outlen <= 260;
> + i < len && *outlen <= 255;
> *outlen += 1)
> {
> if (escape && (*ip == ':')) {
Don't we also need to fix the "utf8" option case?
> --- linux-source-2.6.22/fs/fat/dir.c.orig 2007-07-09 07:32:17.000000000
> +0800
> +++ linux-source-2.6.22/fs/fat/dir.c 2008-02-14 00:42:52.000000000 +0800
> @@ -124,7 +124,7 @@ static inline int fat_get_entry(struct i
> * but ignore that right now.
> * Ahem... Stack smashing in ring 0 isn't fun. Fixed.
> */
> -static int uni16_to_x8(unsigned char *ascii, wchar_t *uni, int uni_xlate,
> +static int uni16_to_x8(unsigned char *ascii, wchar_t *uni, int len, int
> uni_xlate,
> struct nls_table *nls)
> {
> wchar_t *ip, ec;
> @@ -135,10 +135,13 @@ static int uni16_to_x8(unsigned char *as
> ip = uni;
> op = ascii;
>
> - while (*ip) {
> + BUG_ON(len <= NLS_MAX_CHARSET_SIZE);
Do we need this check?
> + while (*ip && (len-NLS_MAX_CHARSET_SIZE)>0) {
coding style
--
OGAWA Hirofumi <[EMAIL PROTECTED]>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
