Skip to content

Commit ec772f0

Browse files
ebiggerstytso
authored andcommitted
ext4: fix race conditions in ->d_compare() and ->d_hash()
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 ext4_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 ext4_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 <[email protected]> Fixes: b886ee3 ("ext4: Support case-insensitive file name lookups") Cc: <[email protected]> # v5.2+ Signed-off-by: Eric Biggers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 244adf6 commit ec772f0

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

fs/ext4/dir.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,11 @@ static int ext4_d_compare(const struct dentry *dentry, unsigned int len,
671671
const char *str, const struct qstr *name)
672672
{
673673
struct qstr qstr = {.name = str, .len = len };
674-
struct inode *inode = dentry->d_parent->d_inode;
674+
const struct dentry *parent = READ_ONCE(dentry->d_parent);
675+
const struct inode *inode = READ_ONCE(parent->d_inode);
675676

676-
if (!IS_CASEFOLDED(inode) || !EXT4_SB(inode->i_sb)->s_encoding) {
677+
if (!inode || !IS_CASEFOLDED(inode) ||
678+
!EXT4_SB(inode->i_sb)->s_encoding) {
677679
if (len != name->len)
678680
return -1;
679681
return memcmp(str, name->name, len);
@@ -686,10 +688,11 @@ static int ext4_d_hash(const struct dentry *dentry, struct qstr *str)
686688
{
687689
const struct ext4_sb_info *sbi = EXT4_SB(dentry->d_sb);
688690
const struct unicode_map *um = sbi->s_encoding;
691+
const struct inode *inode = READ_ONCE(dentry->d_inode);
689692
unsigned char *norm;
690693
int len, ret = 0;
691694

692-
if (!IS_CASEFOLDED(dentry->d_inode) || !um)
695+
if (!inode || !IS_CASEFOLDED(inode) || !um)
693696
return 0;
694697

695698
norm = kmalloc(PATH_MAX, GFP_ATOMIC);

0 commit comments

Comments
 (0)