From patchwork Wed Aug 18 11:11:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 12444035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93741C4338F for ; Wed, 18 Aug 2021 11:11:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 785C16109E for ; Wed, 18 Aug 2021 11:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235795AbhHRLMb (ORCPT ); Wed, 18 Aug 2021 07:12:31 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:46494 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235596AbhHRLMY (ORCPT ); Wed, 18 Aug 2021 07:12:24 -0400 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 9D05E20062 for ; Wed, 18 Aug 2021 11:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1629285109; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qx5D4cC2d9fVaaV/ms1gqNVLOQq+z40P3w0wFU3wSQw=; b=gwZo+RKW2I0R3QuKnTXOUPhXBi3P/yW2SKtfn9le6mmYbhEt6P14vpOO/IMnIOegNgSi0e bDt7ao66Ed+6+46CLg1RRCT+7M1KhfvP0K5q6XWHLRAzBuoMynb+7H68ZKLbYFWRPleekA 4hYYjvhlOqhcl1ltvC8ORm7Z7HRlV0s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1629285109; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qx5D4cC2d9fVaaV/ms1gqNVLOQq+z40P3w0wFU3wSQw=; b=0VqzhnoQzdw5cVhR5Ez160CmZPtSOMsD7x1DqnreEbqQjjOQZ6/GGsClxc8D6JaAHgiEZs rprhj8lBrvPYcBBA== Received: from echidna.suse.de (ddiss.udp.ovpn2.nue.suse.de [10.163.47.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 7DBC8A3BA2; Wed, 18 Aug 2021 11:11:49 +0000 (UTC) From: David Disseldorp To: linux-fsdevel@vger.kernel.org Cc: David Disseldorp , Takashi Iwai Subject: [PATCH 1/2] exfat: add keeptail mount option Date: Wed, 18 Aug 2021 13:11:22 +0200 Message-Id: <20210818111123.19818-2-ddiss@suse.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818111123.19818-1-ddiss@suse.de> References: <20210818111123.19818-1-ddiss@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The "keeptail" mount option will, in a subsequent commit, control whether or not trailing periods '.' are stripped from path components. Suggested-by: Takashi Iwai Signed-off-by: David Disseldorp --- fs/exfat/exfat_fs.h | 3 ++- fs/exfat/super.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/exfat/exfat_fs.h b/fs/exfat/exfat_fs.h index 1d6da61157c9..af33f867b34e 100644 --- a/fs/exfat/exfat_fs.h +++ b/fs/exfat/exfat_fs.h @@ -204,7 +204,8 @@ struct exfat_mount_options { /* on error: continue, panic, remount-ro */ enum exfat_error_mode errors; unsigned utf8:1, /* Use of UTF-8 character set */ - discard:1; /* Issue discard requests on deletions */ + discard:1, /* Issue discard requests on deletions */ + keeptail:1; /* Keep trailing periods in paths */ int time_offset; /* Offset of timestamps from UTC (in minutes) */ }; diff --git a/fs/exfat/super.c b/fs/exfat/super.c index 5539ffc20d16..a55c810ffd90 100644 --- a/fs/exfat/super.c +++ b/fs/exfat/super.c @@ -173,6 +173,8 @@ static int exfat_show_options(struct seq_file *m, struct dentry *root) seq_puts(m, ",errors=remount-ro"); if (opts->discard) seq_puts(m, ",discard"); + if (opts->keeptail) + seq_puts(m, ",keeptail"); if (opts->time_offset) seq_printf(m, ",time_offset=%d", opts->time_offset); return 0; @@ -216,6 +218,7 @@ enum { Opt_charset, Opt_errors, Opt_discard, + Opt_keeptail, Opt_time_offset, /* Deprecated options */ @@ -242,6 +245,7 @@ static const struct fs_parameter_spec exfat_parameters[] = { fsparam_string("iocharset", Opt_charset), fsparam_enum("errors", Opt_errors, exfat_param_enums), fsparam_flag("discard", Opt_discard), + fsparam_flag("keeptail", Opt_keeptail), fsparam_s32("time_offset", Opt_time_offset), __fsparam(NULL, "utf8", Opt_utf8, fs_param_deprecated, NULL), @@ -296,6 +300,9 @@ static int exfat_parse_param(struct fs_context *fc, struct fs_parameter *param) case Opt_discard: opts->discard = 1; break; + case Opt_keeptail: + opts->keeptail = 1; + break; case Opt_time_offset: /* * Make the limit 24 just in case someone invents something From patchwork Wed Aug 18 11:11:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Disseldorp X-Patchwork-Id: 12444039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49A7EC4338F for ; Wed, 18 Aug 2021 11:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34AD36108F for ; Wed, 18 Aug 2021 11:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235864AbhHRLMf (ORCPT ); Wed, 18 Aug 2021 07:12:35 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:46500 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235606AbhHRLMZ (ORCPT ); Wed, 18 Aug 2021 07:12:25 -0400 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id C4E232006B for ; Wed, 18 Aug 2021 11:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1629285109; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LbGDoq2IilZiL4ZDcGZyeTBcBh/zSOLUvNEnuIrEpv0=; b=KAlW7gkKhmtsZWgfN+xGTZiMIDCgBrsiFgjquz94QTX7p4hI56LUzTcthU9nebtuEkrFuU 5BaNoquXJGkqFf5ltxi4SApNdmaUEPQGtl7+SHHEbrPfCd2N/4vwk4WKJf8RjlOuRDsy5v kICQI61RfC7Iv4TvAZIcGI6oZXSEzUU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1629285109; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LbGDoq2IilZiL4ZDcGZyeTBcBh/zSOLUvNEnuIrEpv0=; b=bzMPOuMsJ9BL5/A2bp6GUHcYvpY4vr0MzoBTTmEod4V6RMThVJ519LMYSaZ+bLhiihs7qP DAbKE7aQl7tYTCBg== Received: from echidna.suse.de (ddiss.udp.ovpn2.nue.suse.de [10.163.47.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id A5C61A3BA3; Wed, 18 Aug 2021 11:11:49 +0000 (UTC) From: David Disseldorp To: linux-fsdevel@vger.kernel.org Cc: David Disseldorp , Takashi Iwai Subject: [PATCH 2/2] exfat: keep trailing dots in paths if keeptail is set Date: Wed, 18 Aug 2021 13:11:23 +0200 Message-Id: <20210818111123.19818-3-ddiss@suse.de> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210818111123.19818-1-ddiss@suse.de> References: <20210818111123.19818-1-ddiss@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org exfat currently unconditionally strips trailing periods '.' when performing path lookup. This is done intentionally, loosely following Windows behaviour and specifications which state: #exFAT The concatenated file name has the same set of illegal characters as other FAT-based file systems (see Table 31). #FAT ... Leading and trailing spaces in a long name are ignored. Leading and embedded periods are allowed in a name and are stored in the long name. Trailing periods are ignored. Note: Leading and trailing space ' ' characters are currently retained by Linux kernel exfat, in conflict with the above specification. Some implementations, such as fuse-exfat, don't perform path trailer removal. When mounting images which contain trailing-dot paths, these paths are unreachable, e.g.: + mount.exfat-fuse /dev/zram0 /mnt/test/ FUSE exfat 1.3.0 + cd /mnt/test/ + touch fuse_created_dots... ' fuse_created_spaces ' + ls -l total 0 -rwxrwxrwx 1 root 0 0 Aug 18 09:45 ' fuse_created_spaces ' -rwxrwxrwx 1 root 0 0 Aug 18 09:45 fuse_created_dots... + cd / + umount /mnt/test/ + mount -t exfat /dev/zram0 /mnt/test + cd /mnt/test + ls -l ls: cannot access 'fuse_created_dots...': No such file or directory total 0 -rwxr-xr-x 1 root 0 0 Aug 18 09:45 ' fuse_created_spaces ' -????????? ? ? ? ? ? fuse_created_dots... + touch kexfat_created_dots... ' kexfat_created_spaces ' + ls -l ls: cannot access 'fuse_created_dots...': No such file or directory total 0 -rwxr-xr-x 1 root 0 0 Aug 18 09:45 ' fuse_created_spaces ' -rwxr-xr-x 1 root 0 0 Aug 18 09:45 ' kexfat_created_spaces ' -????????? ? ? ? ? ? fuse_created_dots... -rwxr-xr-x 1 root 0 0 Aug 18 09:45 kexfat_created_dots + cd / + umount /mnt/test/ With this change, the "keeptail" mount option can be used to access paths with trailing periods. E.g. continuing from the previous example: + mount -t exfat -o keeptail /dev/zram0 /mnt/test + cd /mnt/test + ls -l total 0 -rwxr-xr-x 1 root 0 0 Aug 18 10:32 ' fuse_created_spaces ' -rwxr-xr-x 1 root 0 0 Aug 18 10:32 ' kexfat_created_spaces ' -rwxr-xr-x 1 root 0 0 Aug 18 10:32 fuse_created_dots... -rwxr-xr-x 1 root 0 0 Aug 18 10:32 kexfat_created_dots Link: https://bugzilla.suse.com/show_bug.cgi?id=1188964 Link: https://lore.kernel.org/linux-fsdevel/003b01d755e4$31fb0d80$95f12880$@samsung.com/ Link: https://docs.microsoft.com/en-us/windows/win32/fileio/exfat-specification#773-filename-field Suggested-by: Takashi Iwai Signed-off-by: David Disseldorp --- fs/exfat/namei.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c index 24b41103d1cc..e49455ce6da2 100644 --- a/fs/exfat/namei.c +++ b/fs/exfat/namei.c @@ -65,11 +65,14 @@ static int exfat_d_revalidate(struct dentry *dentry, unsigned int flags) return ret; } -/* returns the length of a struct qstr, ignoring trailing dots */ -static unsigned int exfat_striptail_len(unsigned int len, const char *name) +/* returns the length of a struct qstr, possibly ignoring trailing dots */ +static unsigned int exfat_striptail_len(struct super_block *sb, + unsigned int len, const char *name) { - while (len && name[len - 1] == '.') - len--; + if (!EXFAT_SB(sb)->options.keeptail) { + while (len && name[len - 1] == '.') + len--; + } return len; } @@ -83,7 +86,7 @@ static int exfat_d_hash(const struct dentry *dentry, struct qstr *qstr) struct super_block *sb = dentry->d_sb; struct nls_table *t = EXFAT_SB(sb)->nls_io; const unsigned char *name = qstr->name; - unsigned int len = exfat_striptail_len(qstr->len, qstr->name); + unsigned int len = exfat_striptail_len(sb, qstr->len, qstr->name); unsigned long hash = init_name_hash(dentry); int i, charlen; wchar_t c; @@ -104,8 +107,8 @@ static int exfat_d_cmp(const struct dentry *dentry, unsigned int len, { struct super_block *sb = dentry->d_sb; struct nls_table *t = EXFAT_SB(sb)->nls_io; - unsigned int alen = exfat_striptail_len(name->len, name->name); - unsigned int blen = exfat_striptail_len(len, str); + unsigned int alen = exfat_striptail_len(sb, name->len, name->name); + unsigned int blen = exfat_striptail_len(sb, len, str); wchar_t c1, c2; int charlen, i; @@ -136,7 +139,7 @@ static int exfat_utf8_d_hash(const struct dentry *dentry, struct qstr *qstr) { struct super_block *sb = dentry->d_sb; const unsigned char *name = qstr->name; - unsigned int len = exfat_striptail_len(qstr->len, qstr->name); + unsigned int len = exfat_striptail_len(sb, qstr->len, qstr->name); unsigned long hash = init_name_hash(dentry); int i, charlen; unicode_t u; @@ -161,8 +164,8 @@ static int exfat_utf8_d_cmp(const struct dentry *dentry, unsigned int len, const char *str, const struct qstr *name) { struct super_block *sb = dentry->d_sb; - unsigned int alen = exfat_striptail_len(name->len, name->name); - unsigned int blen = exfat_striptail_len(len, str); + unsigned int alen = exfat_striptail_len(sb, name->len, name->name); + unsigned int blen = exfat_striptail_len(sb, len, str); unicode_t u_a, u_b; int charlen, i; @@ -419,7 +422,7 @@ static int __exfat_resolve_path(struct inode *inode, const unsigned char *path, struct exfat_inode_info *ei = EXFAT_I(inode); /* strip all trailing periods */ - namelen = exfat_striptail_len(strlen(path), path); + namelen = exfat_striptail_len(sb, strlen(path), path); if (!namelen) return -ENOENT;