linux-kernel - Re: [PATCH] nls: add surrogate pair support in nls utf8.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 6 Dec 2011 08:41:08 +0900
From:	Namjae Jeon <linkinjeon@...il.com>
To:	Alan Stern <stern@...land.harvard.edu>
Cc:	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
	Ashish Sangwan <ashishsangwan2@...il.com>
Subject: Re: [PATCH] nls: add surrogate pair support in nls utf8.

2011/12/5 Alan Stern <stern@...land.harvard.edu>:
> On Sun, 4 Dec 2011, Namjae Jeon wrote:
>
>> It allows surrogate pair in nls utf8.
>
> That's a pretty brief description.
okay~ I will rewrite more.
>
>> --- a/fs/nls/nls_utf8.c
>> +++ b/fs/nls/nls_utf8.c
>> @@ -30,13 +30,24 @@ static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
>>  {
>>       int n;
>>       unicode_t u;
>> +     u16 *op;
>>
>> +     op = uni;
>>       n = utf8_to_utf32(rawstring, boundlen, &u);
>> -     if (n < 0 || u > MAX_WCHAR_T) {
>> +     if (n < 0 || u > UNICODE_MAX) {
>>               *uni = 0x003f;  /* ? */
>>               return -EINVAL;
>>       }
>> -     *uni = (wchar_t) u;
>> +
>> +     if (u >= PLANE_SIZE) {
>> +             u -= PLANE_SIZE;
>> +             *op++ = (wchar_t) (SURROGATE_PAIR |
>> +             ((u >> 10) & SURROGATE_BITS));
>> +             *op++ = (wchar_t) (SURROGATE_PAIR |
>> +             SURROGATE_LOW | (u & SURROGATE_BITS));
>> +             } else
>> +                     *op++ = (wchar_t) u;
>> +
>>       return n;
>>  }
>
> Firstly, have you checked whether the callers of this function expect
> to receive back more than one 16-bit value?  Maybe you will overrun
> their buffers by doing this.
Hi Alan.
first Thanks for your review.
yes, you're right. and yes I have checked it on FAT fs,  I will try to
post the below FAT patch after this patch is applied.
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------

--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -555,7 +555,10 @@ xlate_to_uni(const unsigned char *name, int len,
unsigned char *outname,
                                                return -EINVAL;
                                        ip += charlen;
                                        i += charlen;
-                                       op += 2;
+                                       if (charlen == sizeof(unicode_t))
+                                               op += 4;
+                                       else
+                                               op += 2;
                                }
                        }
-----------------------------------------------------------------------------------------------------------------------------------

>
> Secondly, you shouldn't have to make all these changes.  Just call
> utf8s_to_utf16s(); then all you have to worry about is changing an
> invalid character to a '?'.
Currently there are two paths along mount option. if using -o utf8
mount option, utf8s_to_utf16s have been used in xlate_to_uni of FAT.
and if using iocharset=utf8, char2uni have been used..
nls->char2uni works on a single charachter while utf8s_to_utf16s works
on whole string.
when the mount option(uni_xlate) that require scanning character by
character is used it is needed.
>
> Alan Stern
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/