linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eugen Hristev <eugen.hristev@collabora.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca,
	linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel@collabora.com,
	eugen.hristev@collabora.com, viro@zeniv.linux.org.uk,
	brauner@kernel.org, jack@suse.cz, krisman@suse.de
Subject: [PATCH v14 7/9] f2fs: Log error when lookup of encoded dentry fails
Date: Wed, 20 Mar 2024 10:46:20 +0200	[thread overview]
Message-ID: <20240320084622.46643-8-eugen.hristev@collabora.com> (raw)
In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com>

If the volume is in strict mode, generi c_ci_compare can report a broken
encoding name.  This will not trigger on a bad lookup, which is caught
earlier, only if the actual disk name is bad.

Suggested-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
---
 fs/f2fs/dir.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 88b0045d0c4f..3b0003e8767a 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -192,11 +192,22 @@ static inline int f2fs_match_name(const struct inode *dir,
 	struct fscrypt_name f;
 
 #if IS_ENABLED(CONFIG_UNICODE)
-	if (fname->cf_name.name)
-		return generic_ci_match(dir, fname->usr_fname,
-					&fname->cf_name,
-					de_name, de_name_len);
-
+	if (fname->cf_name.name) {
+		int ret = generic_ci_match(dir, fname->usr_fname,
+					   &fname->cf_name,
+					   de_name, de_name_len);
+		if (ret < 0) {
+			/*
+			 * Treat comparison errors as not a match.  The
+			 * only case where it happens is on a disk
+			 * corruption or ENOMEM.
+			 */
+			if (ret == -EINVAL)
+				f2fs_warn(F2FS_SB(dir->i_sb),
+					"Directory contains filename that is invalid UTF-8");
+		}
+		return ret;
+	}
 #endif
 	f.usr_fname = fname->usr_fname;
 	f.disk_name = fname->disk_name;
-- 
2.34.1


  parent reply	other threads:[~2024-03-20  8:46 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-20  8:46 [PATCH v14 0/9] Cache insensitive cleanup for ext4/f2fs Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 1/9] ext4: Simplify the handling of cached insensitive names Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 2/9] f2fs: " Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 3/9] libfs: Introduce case-insensitive string comparison helper Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 4/9] ext4: Reuse generic_ci_match for ci comparisons Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 5/9] f2fs: " Eugen Hristev
2024-03-20  8:46 ` [PATCH v14 6/9] ext4: Log error when lookup of encoded dentry fails Eugen Hristev
2024-03-20  8:46 ` Eugen Hristev [this message]
2024-03-22 22:11   ` [PATCH v14 7/9] f2fs: " Gabriel Krisman Bertazi
2024-03-20  8:46 ` [PATCH v14 8/9] ext4: Move CONFIG_UNICODE defguards into the code flow Eugen Hristev
2024-03-25 16:26   ` Gabriel Krisman Bertazi
2024-03-20  8:46 ` [PATCH v14 9/9] f2fs: " Eugen Hristev

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=20240320084622.46643-8-eugen.hristev@collabora.com \
    --to=eugen.hristev@collabora.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=brauner@kernel.org \
    --cc=chao@kernel.org \
    --cc=jack@suse.cz \
    --cc=jaegeuk@kernel.org \
    --cc=kernel@collabora.com \
    --cc=krisman@suse.de \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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).