f2fs: fixes for f2fs_d_compare() and f2fs_d_hash()
Subsystems (2)
cover f2fs: fixes for f2fs_d_compare() and f2fs_d_hash()
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(-)
Signature · 1 line
2.25.0
PATCH 1/2 f2fs: fix dcache lookup of !casefolded directories
From: Eric Biggers <[email protected]>
Do the name comparison for non-casefolded directories correctly.
This is analogous to ext4's commit 66883da1eee8 ("ext4: fix dcache lookup of !casefolded directories").
--- fs/f2fs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/dir.c +1 -1
@@ -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);
Signature · 1 line
2.25.0
PATCH 2/2 f2fs: fix race conditions in ->d_compare() and ->d_hash()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
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.
--- fs/f2fs/dir.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/f2fs/dir.c +6 -3
@@ -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 );
Signature · 1 line
2.25.0