diff options
| author | David Howells | 2015-01-27 15:18:39 +0000 |
|---|---|---|
| committer | Al Viro | 2015-02-20 04:56:43 -0500 |
| commit | 112fc894a7c49e6435f91faa1cebfd425e6f3ace (patch) | |
| tree | 931871efbfd4ed07b370a784e37edd18c72bad0c /fs/configfs | |
| parent | a457ac28543cfa5101222b5ef90329c36611107c (diff) | |
configfs: Fix potential NULL d_inode dereference
Code that does this:
if (!(d_unhashed(dentry) && dentry->d_inode)) {
...
simple_unlink(parent->d_inode, dentry);
}
is broken because:
!(d_unhashed(dentry) && dentry->d_inode)
is equivalent to:
!d_unhashed(dentry) || !dentry->d_inode
so it is possible to get into simple_unlink() with dentry->d_inode == NULL.
simple_unlink(), however, assumes dentry->d_inode cannot be NULL.
I think that what was meant is this:
!d_unhashed(dentry) && dentry->d_inode
and that the logical-not operator or the final close-bracket was misplaced.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/configfs')
| -rw-r--r-- | fs/configfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index 60727db7b0a3..5423a6a6ecc8 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c @@ -236,7 +236,7 @@ void configfs_drop_dentry(struct configfs_dirent * sd, struct dentry * parent) if (dentry) { spin_lock(&dentry->d_lock); - if (!(d_unhashed(dentry) && dentry->d_inode)) { + if (!d_unhashed(dentry) && dentry->d_inode) { dget_dlock(dentry); __d_drop(dentry); spin_unlock(&dentry->d_lock); |