Skip to content

Commit c42dd06

Browse files
sishuaigongChristoph Hellwig
authored andcommitted
configfs: fix a race in configfs_lookup()
When configfs_lookup() is executing list_for_each_entry(), it is possible that configfs_dir_lseek() is calling list_del(). Some unfortunate interleavings of them can cause a kernel NULL pointer dereference error Thread 1 Thread 2 //configfs_dir_lseek() //configfs_lookup() list_del(&cursor->s_sibling); list_for_each_entry(sd, ...) Fix this by grabbing configfs_dirent_lock in configfs_lookup() while iterating ->s_children. Signed-off-by: Sishuai Gong <sishuai@purdue.edu> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent d07f132 commit c42dd06

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

fs/configfs/dir.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,13 +439,13 @@ static struct dentry * configfs_lookup(struct inode *dir,
439439
if (!configfs_dirent_is_ready(parent_sd))
440440
return ERR_PTR(-ENOENT);
441441

442+
spin_lock(&configfs_dirent_lock);
442443
list_for_each_entry(sd, &parent_sd->s_children, s_sibling) {
443444
if ((sd->s_type & CONFIGFS_NOT_PINNED) &&
444445
!strcmp(configfs_get_name(sd), dentry->d_name.name)) {
445446
struct configfs_attribute *attr = sd->s_element;
446447
umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;
447448

448-
spin_lock(&configfs_dirent_lock);
449449
dentry->d_fsdata = configfs_get(sd);
450450
sd->s_dentry = dentry;
451451
spin_unlock(&configfs_dirent_lock);
@@ -462,10 +462,11 @@ static struct dentry * configfs_lookup(struct inode *dir,
462462
inode->i_size = PAGE_SIZE;
463463
inode->i_fop = &configfs_file_operations;
464464
}
465-
break;
465+
goto done;
466466
}
467467
}
468-
468+
spin_unlock(&configfs_dirent_lock);
469+
done:
469470
d_add(dentry, inode);
470471
return NULL;
471472
}

0 commit comments

Comments
 (0)