From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
To: linux-ext4@vger.kernel.org
Cc: Daniel Rosenberg <drosen@google.com>,
Gabriel Krisman Bertazi <krisman@collabora.com>,
Arnaud Ferraris <arnaud.ferraris@collabora.com>
Subject: [PATCH v2 10/12] e2fsck: Add option to force encoded filename verification
Date: Fri, 27 Nov 2020 18:01:14 +0100 [thread overview]
Message-ID: <20201127170116.197901-11-arnaud.ferraris@collabora.com> (raw)
In-Reply-To: <20201127170116.197901-1-arnaud.ferraris@collabora.com>
From: Gabriel Krisman Bertazi <krisman@collabora.com>
This is interesting for !strict filesystems as part of the encoding
update procedure. Once the filesystem is known to not have badly encoded
filenames, the update is trivial, thanks to the stability of assigned
code points in the unicode specification.
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
---
e2fsck/e2fsck.h | 1 +
e2fsck/pass2.c | 5 +++--
e2fsck/unix.c | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index dcaab0a1..f324e92c 100644
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -177,6 +177,7 @@ struct resource_track {
#define E2F_OPT_ICOUNT_FULLMAP 0x20000 /* use an array for inode counts */
#define E2F_OPT_UNSHARE_BLOCKS 0x40000
#define E2F_OPT_CLEAR_UNINIT 0x80000 /* Hack to clear the uninit bit */
+#define E2F_OPT_CHECK_ENCODING 0x100000 /* Force verification of encoded filenames */
/*
* E2fsck flags
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index b6514de8..f93e2b53 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -1049,9 +1049,10 @@ static int check_dir_block(ext2_filsys fs,
ctx = cd->ctx;
/* We only want filename encoding verification on strict
- * mode. */
+ * mode or if explicitly requested by user. */
if (ext2fs_test_inode_bitmap2(ctx->inode_casefold_map, ino) &&
- (ctx->fs->super->s_encoding_flags & EXT4_ENC_STRICT_MODE_FL))
+ ((ctx->fs->super->s_encoding_flags & EXT4_ENC_STRICT_MODE_FL) ||
+ (ctx->options & E2F_OPT_CHECK_ENCODING)))
cf_dir = 1;
if (ctx->flags & E2F_FLAG_RUN_RETURN)
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 1cb51672..0a9012e5 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -753,6 +753,9 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
ctx->options |= E2F_OPT_UNSHARE_BLOCKS;
ctx->options |= E2F_OPT_FORCE;
continue;
+ } else if (strcmp(token, "check_encoding") == 0) {
+ ctx->options |= E2F_OPT_CHECK_ENCODING;
+ continue;
#ifdef CONFIG_DEVELOPER_FEATURES
} else if (strcmp(token, "clear_all_uninit_bits") == 0) {
ctx->options |= E2F_OPT_CLEAR_UNINIT;
@@ -784,6 +787,7 @@ static void parse_extended_opts(e2fsck_t ctx, const char *opts)
fputs("\tbmap2extent\n", stderr);
fputs("\tunshare_blocks\n", stderr);
fputs("\tfixes_only\n", stderr);
+ fputs("\tcheck_encoding\n", stderr);
fputc('\n', stderr);
exit(1);
}
--
2.28.0
next prev parent reply other threads:[~2020-11-27 17:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 17:01 [PATCH v2 00/12] e2fsprogs: improve case-insensitive fs support Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 01/12] tune2fs: Allow enabling casefold feature after fs creation Arnaud Ferraris
2020-12-07 17:17 ` Gabriel Krisman Bertazi
2020-11-27 17:01 ` [PATCH v2 02/12] tune2fs: Fix casefold+encrypt error message Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 03/12] ext2fs: Add method to validate casefolded strings Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 04/12] ext2fs: Implement faster CI comparison of strings Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 05/12] e2fsck: add new problem for casefolded name check Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 06/12] e2fsck: Fix entries with invalid encoded characters Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 07/12] e2fsck: Support casefold directories when rehashing Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 08/12] dict: Support comparison with context Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 09/12] e2fsck: Detect duplicated casefolded direntries for rehash Arnaud Ferraris
2020-11-27 17:01 ` Arnaud Ferraris [this message]
2020-11-27 17:01 ` [PATCH v2 11/12] e2fsck.8.in: Document check_encoding extended option Arnaud Ferraris
2020-11-27 17:01 ` [PATCH v2 12/12] tests: f_bad_fname: Test fixes of invalid filenames and duplicates Arnaud Ferraris
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=20201127170116.197901-11-arnaud.ferraris@collabora.com \
--to=arnaud.ferraris@collabora.com \
--cc=drosen@google.com \
--cc=krisman@collabora.com \
--cc=linux-ext4@vger.kernel.org \
/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).