From: "Pali Rohár" <pali@kernel.org>
To: Viacheslav Dubeyko <slava@dubeyko.com>
Cc: "Linux FS Devel" <linux-fsdevel@vger.kernel.org>,
linux-ntfs-dev@lists.sourceforge.net, linux-cifs@vger.kernel.org,
jfs-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
"Jan Kara" <jack@suse.cz>,
"OGAWA Hirofumi" <hirofumi@mail.parknet.co.jp>,
"Theodore Y . Ts'o" <tytso@mit.edu>,
"Luis de Bethencourt" <luisbg@kernel.org>,
"Salah Triki" <salah.triki@gmail.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Dave Kleikamp" <shaggy@kernel.org>,
"Anton Altaparmakov" <anton@tuxera.com>,
"Pavel Machek" <pavel@ucw.cz>, "Marek Behún" <marek.behun@nic.cz>,
"Christoph Hellwig" <hch@infradead.org>
Subject: Re: [RFC PATCH 13/20] hfsplus: Do not use broken utf8 NLS table for iocharset=utf8 mount option
Date: Sun, 25 Sep 2022 14:12:06 +0200 [thread overview]
Message-ID: <20220925121206.glqeuptele746qsp@pali> (raw)
In-Reply-To: <4D2445C9-7D4D-438A-964C-5B8F46BC15B5@dubeyko.com>
Hello!
On Monday 09 August 2021 10:42:02 Viacheslav Dubeyko wrote:
> > On Aug 8, 2021, at 9:24 AM, Pali Rohár <pali@kernel.org> wrote:
> >
> > NLS table for utf8 is broken and cannot be fixed.
> >
> > So instead of broken utf8 nls functions char2uni() and uni2char() use
> > functions utf8_to_utf32() and utf32_to_utf8() which implements correct
> > encoding and decoding between Unicode code points and UTF-8 sequence.
> >
> > Note that this fs driver does not support full Unicode range, specially
> > UTF-16 surrogate pairs are unsupported. This patch does not change this
> > limitation and support for UTF-16 surrogate pairs stay unimplemented.
> >
> > When iochatset=utf8 is used then set sbi->nls to NULL and use it for
> > distinguish between the fact if NLS table or native UTF-8 functions should
> > be used.
> >
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> > fs/hfsplus/dir.c | 6 ++++--
> > fs/hfsplus/options.c | 32 ++++++++++++++++++--------------
> > fs/hfsplus/super.c | 7 +------
> > fs/hfsplus/unicode.c | 31 ++++++++++++++++++++++++++++---
> > fs/hfsplus/xattr.c | 14 +++++++++-----
> > fs/hfsplus/xattr_security.c | 3 ++-
> > 6 files changed, 62 insertions(+), 31 deletions(-)
> >
> > diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
> > index 84714bbccc12..2caf0cd82221 100644
> > --- a/fs/hfsplus/dir.c
> > +++ b/fs/hfsplus/dir.c
> > @@ -144,7 +144,8 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)
> > err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
> > if (err)
> > return err;
> > - strbuf = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_MAX_STRLEN + 1, GFP_KERNEL);
> > + strbuf = kmalloc((HFSPLUS_SB(sb)->nls ? NLS_MAX_CHARSET_SIZE : 4) *
> > + HFSPLUS_MAX_STRLEN + 1, GFP_KERNEL);
>
> Maybe, introduce some variable that will contain the length calculation?
Ok! I can introduce variable with calculated length into all places.
> > if (!strbuf) {
> > err = -ENOMEM;
> > goto out;
> > @@ -203,7 +204,8 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)
> > hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
> > fd.entrylength);
> > type = be16_to_cpu(entry.type);
> > - len = NLS_MAX_CHARSET_SIZE * HFSPLUS_MAX_STRLEN;
> > + len = (HFSPLUS_SB(sb)->nls ? NLS_MAX_CHARSET_SIZE : 4) *
> > + HFSPLUS_MAX_STRLEN;
> > err = hfsplus_uni2asc(sb, &fd.key->cat.name, strbuf, &len);
> > if (err)
> > goto out;
> > diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
> > index a975548f6b91..16c08cb5c4f8 100644
> > --- a/fs/hfsplus/options.c
> > +++ b/fs/hfsplus/options.c
> > @@ -104,6 +104,9 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
> > char *p;
> > substring_t args[MAX_OPT_ARGS];
> > int tmp, token;
> > + int have_iocharset;
> > +
> > + have_iocharset = 0;
>
> What’s about boolean type and to use true/false?
Ok. I can change type to "bool" and use "true"/"false" values.
> >
> > if (!input)
> > goto done;
> > @@ -171,20 +174,24 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
> > pr_warn("option nls= is deprecated, use iocharset=\n");
> > /* fallthrough */
> > case opt_iocharset:
> > - if (sbi->nls) {
> > + if (have_iocharset) {
> > pr_err("unable to change nls mapping\n");
> > return 0;
> > }
> > p = match_strdup(&args[0]);
> > - if (p)
> > - sbi->nls = load_nls(p);
> > - if (!sbi->nls) {
> > - pr_err("unable to load nls mapping \"%s\"\n",
> > - p);
> > - kfree(p);
> > + if (!p)
> > return 0;
> > + if (strcmp(p, "utf8") != 0) {
> > + sbi->nls = load_nls(p);
> > + if (!sbi->nls) {
> > + pr_err("unable to load nls mapping "
> > + "\"%s\"\n", p);
> > + kfree(p);
> > + return 0;
> > + }
> > }
> > kfree(p);
> > + have_iocharset = 1;
>
> Ditto. What’s about true here?
>
> > break;
> > case opt_decompose:
> > clear_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags);
...
> > @@ -256,7 +266,22 @@ int hfsplus_uni2asc(struct super_block *sb,
> > static inline int asc2unichar(struct super_block *sb, const char *astr, int len,
> > wchar_t *uc)
> > {
> > - int size = HFSPLUS_SB(sb)->nls->char2uni(astr, len, uc);
> > + struct nls_table *nls = HFSPLUS_SB(sb)->nls;
> > + unicode_t u;
> > + int size;
> > +
> > + if (nls)
> > + size = nls->char2uni(astr, len, uc);
> > + else {
> > + size = utf8_to_utf32(astr, len, &u);
> > + if (size >= 0) {
> > + /* TODO: Add support for UTF-16 surrogate pairs */
>
> Have you forgot to delete this string? Or do you plan to implement this?
No. I have not forgot. In current version there is missing support for
UTF-16 surrogate pairs and this my patch still does not implement it.
So this is kind a issue / bug in the driver and at least it should be
documented. So reader of this code would know it and maybe somebody in
future will implement it.
> > + if (u <= MAX_WCHAR_T)
> > + *uc = u;
> > + else
> > + size = -EINVAL;
> > + }
> > + }
next prev parent reply other threads:[~2022-09-25 12:12 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-08 16:24 [RFC PATCH 00/20] fs: Remove usage of broken nls_utf8 and drop it Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 01/20] fat: Fix iocharset=utf8 mount option Pali Rohár
2021-08-15 3:42 ` OGAWA Hirofumi
2021-08-15 9:42 ` Pali Rohár
2021-08-15 11:23 ` OGAWA Hirofumi
2021-08-23 3:51 ` Kari Argillander
2021-08-08 16:24 ` [RFC PATCH 02/20] hfsplus: Add iocharset= mount option as alias for nls= Pali Rohár
2021-08-09 17:51 ` Viacheslav Dubeyko
2021-08-09 20:49 ` Kari Argillander
2021-08-09 21:25 ` Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 03/20] udf: Fix iocharset=utf8 mount option Pali Rohár
2021-08-12 14:17 ` Jan Kara
2021-08-12 15:51 ` Pali Rohár
2021-08-13 13:48 ` Jan Kara
2021-08-19 8:34 ` Pali Rohár
2021-08-19 10:41 ` Jan Kara
2021-08-08 16:24 ` [RFC PATCH 04/20] isofs: joliet: " Pali Rohár
2021-08-12 14:18 ` Jan Kara
2021-08-08 16:24 ` [RFC PATCH 05/20] ntfs: Undeprecate iocharset= " Pali Rohár
2021-08-09 20:52 ` Kari Argillander
2021-08-19 1:21 ` Kari Argillander
2021-08-19 8:12 ` Pali Rohár
2021-08-19 10:23 ` Kari Argillander
2021-08-19 22:04 ` Pali Rohár
2021-08-19 23:18 ` Kari Argillander
2021-08-08 16:24 ` [RFC PATCH 06/20] ntfs: Fix error processing when load_nls() fails Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 07/20] befs: Fix printing iocharset= mount option Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 08/20] befs: Rename enum value Opt_charset to Opt_iocharset to match " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 09/20] befs: Fix error processing when load_nls() fails Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 10/20] befs: Allow to use native UTF-8 mode Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 11/20] hfs: Explicitly set hsb->nls_disk when hsb->nls_io is set Pali Rohár
2021-08-09 17:31 ` Viacheslav Dubeyko
2021-08-09 17:37 ` Matthew Wilcox
2021-08-09 17:47 ` Pali Rohár
2021-08-09 20:43 ` Steve French
2021-08-09 18:00 ` Viacheslav Dubeyko
2021-08-08 16:24 ` [RFC PATCH 12/20] hfs: Do not use broken utf8 NLS table for iocharset=utf8 mount option Pali Rohár
2021-08-09 17:49 ` Viacheslav Dubeyko
2022-09-25 12:06 ` Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 13/20] hfsplus: " Pali Rohár
2021-08-09 17:42 ` Viacheslav Dubeyko
2022-09-25 12:12 ` Pali Rohár [this message]
2021-08-08 16:24 ` [RFC PATCH 14/20] jfs: Remove custom iso8859-1 implementation Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 15/20] jfs: Fix buffer overflow in jfs_strfromUCS_le() function Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 16/20] jfs: Do not use broken utf8 NLS table for iocharset=utf8 mount option Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 17/20] ntfs: " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 18/20] cifs: " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 19/20] cifs: Remove usage of load_nls_default() calls Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 20/20] nls: Drop broken nls_utf8 module Pali Rohár
2021-09-03 21:26 ` [RFC PATCH 00/20] fs: Remove usage of broken nls_utf8 and drop it Kari Argillander
2021-09-03 21:37 ` Pali Rohár
2021-09-03 22:06 ` Kari Argillander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220925121206.glqeuptele746qsp@pali \
--to=pali@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=anton@tuxera.com \
--cc=hch@infradead.org \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jack@suse.cz \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=luisbg@kernel.org \
--cc=marek.behun@nic.cz \
--cc=pavel@ucw.cz \
--cc=salah.triki@gmail.com \
--cc=shaggy@kernel.org \
--cc=slava@dubeyko.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).