Linux-f2fs-devel Archive on lore.kernel.org
 help / color / Atom feed
* [f2fs-dev] [PATCH 0/2] f2fs: fixes for f2fs_d_compare() and f2fs_d_hash()
@ 2020-01-24  4:15 Eric Biggers
  2020-01-24  4:15 ` [f2fs-dev] [PATCH 1/2] f2fs: fix dcache lookup of !casefolded directories Eric Biggers
  2020-01-24  4:15 ` [f2fs-dev] [PATCH 2/2] f2fs: fix race conditions in ->d_compare() and ->d_hash() Eric Biggers
  0 siblings, 2 replies; 3+ messages in thread
From: Eric Biggers @ 2020-01-24  4:15 UTC (permalink / raw)
  To: linux-f2fs-devel
  Cc: linux-fsdevel, linux-ext4, Gabriel Krisman Bertazi,
	Alexander Viro, Daniel Rosenberg

This series fixes dentry comparisons and hashing on f2fs filesystems
with the encoding feature enabled.

Eric Biggers (2):
  f2fs: fix dcache lookup of !casefolded directories
  f2fs: fix race conditions in ->d_compare() and ->d_hash()

 fs/f2fs/dir.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

-- 
2.25.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [f2fs-dev] [PATCH 1/2] f2fs: fix dcache lookup of !casefolded directories
  2020-01-24  4:15 [f2fs-dev] [PATCH 0/2] f2fs: fixes for f2fs_d_compare() and f2fs_d_hash() Eric Biggers
@ 2020-01-24  4:15 ` Eric Biggers
  2020-01-24  4:15 ` [f2fs-dev] [PATCH 2/2] f2fs: fix race conditions in ->d_compare() and ->d_hash() Eric Biggers
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2020-01-24  4:15 UTC (permalink / raw)
  To: linux-f2fs-devel
  Cc: linux-fsdevel, linux-ext4, Gabriel Krisman Bertazi,
	Alexander Viro, Daniel Rosenberg

From: Eric Biggers <ebiggers@google.com>

Do the name comparison for non-casefolded directories correctly.

This is analogous to ext4's commit 66883da1eee8 ("ext4: fix dcache
lookup of !casefolded directories").

Fixes: 2c2eb7a300cd ("f2fs: Support case-insensitive file name lookups")
Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/f2fs/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index b56f6060c1a6b..aea9e2806144d 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -1087,7 +1087,7 @@ static int f2fs_d_compare(const struct dentry *dentry, unsigned int len,
 	if (!IS_CASEFOLDED(dentry->d_parent->d_inode)) {
 		if (len != name->len)
 			return -1;
-		return memcmp(str, name, len);
+		return memcmp(str, name->name, len);
 	}
 
 	return f2fs_ci_compare(dentry->d_parent->d_inode, name, &qstr, false);
-- 
2.25.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [f2fs-dev] [PATCH 2/2] f2fs: fix race conditions in ->d_compare() and ->d_hash()
  2020-01-24  4:15 [f2fs-dev] [PATCH 0/2] f2fs: fixes for f2fs_d_compare() and f2fs_d_hash() Eric Biggers
  2020-01-24  4:15 ` [f2fs-dev] [PATCH 1/2] f2fs: fix dcache lookup of !casefolded directories Eric Biggers
@ 2020-01-24  4:15 ` Eric Biggers
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Biggers @ 2020-01-24  4:15 UTC (permalink / raw)
  To: linux-f2fs-devel
  Cc: linux-fsdevel, linux-ext4, Gabriel Krisman Bertazi,
	Alexander Viro, Daniel Rosenberg

From: Eric Biggers <ebiggers@google.com>

Since ->d_compare() and ->d_hash() can be called in RCU-walk mode,
->d_parent and ->d_inode can be concurrently modified, and in
particular, ->d_inode may be changed to NULL.  For f2fs_d_hash() this
resulted in a reproducible NULL dereference if a lookup is done in a
directory being deleted, e.g. with:

	int main()
	{
		if (fork()) {
			for (;;) {
				mkdir("subdir", 0700);
				rmdir("subdir");
			}
		} else {
			for (;;)
				access("subdir/file", 0);
		}
	}

... or by running the 't_encrypted_d_revalidate' program from xfstests.
Both repros work in any directory on a filesystem with the encoding
feature, even if the directory doesn't actually have the casefold flag.

I couldn't reproduce a crash in f2fs_d_compare(), but it appears that a
similar crash is possible there.

Fix these bugs by reading ->d_parent and ->d_inode using READ_ONCE() and
falling back to the case sensitive behavior if the inode is NULL.

Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Fixes: 2c2eb7a300cd ("f2fs: Support case-insensitive file name lookups")
Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/f2fs/dir.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index aea9e2806144d..d7c9a2cda4899 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -1083,24 +1083,27 @@ static int f2fs_d_compare(const struct dentry *dentry, unsigned int len,
 			  const char *str, const struct qstr *name)
 {
 	struct qstr qstr = {.name = str, .len = len };
+	const struct dentry *parent = READ_ONCE(dentry->d_parent);
+	const struct inode *inode = READ_ONCE(parent->d_inode);
 
-	if (!IS_CASEFOLDED(dentry->d_parent->d_inode)) {
+	if (!inode || !IS_CASEFOLDED(inode)) {
 		if (len != name->len)
 			return -1;
 		return memcmp(str, name->name, len);
 	}
 
-	return f2fs_ci_compare(dentry->d_parent->d_inode, name, &qstr, false);
+	return f2fs_ci_compare(inode, name, &qstr, false);
 }
 
 static int f2fs_d_hash(const struct dentry *dentry, struct qstr *str)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb);
 	const struct unicode_map *um = sbi->s_encoding;
+	const struct inode *inode = READ_ONCE(dentry->d_inode);
 	unsigned char *norm;
 	int len, ret = 0;
 
-	if (!IS_CASEFOLDED(dentry->d_inode))
+	if (!inode || !IS_CASEFOLDED(inode))
 		return 0;
 
 	norm = f2fs_kmalloc(sbi, PATH_MAX, GFP_ATOMIC);
-- 
2.25.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-24  4:15 [f2fs-dev] [PATCH 0/2] f2fs: fixes for f2fs_d_compare() and f2fs_d_hash() Eric Biggers
2020-01-24  4:15 ` [f2fs-dev] [PATCH 1/2] f2fs: fix dcache lookup of !casefolded directories Eric Biggers
2020-01-24  4:15 ` [f2fs-dev] [PATCH 2/2] f2fs: fix race conditions in ->d_compare() and ->d_hash() Eric Biggers

Linux-f2fs-devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-f2fs-devel/0 linux-f2fs-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-f2fs-devel linux-f2fs-devel/ https://lore.kernel.org/linux-f2fs-devel \
		linux-f2fs-devel@lists.sourceforge.net
	public-inbox-index linux-f2fs-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/net.sourceforge.lists.linux-f2fs-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git