Commit 112fc894a7c49e6435f91faa1cebfd425e6f3ace

Authored by David Howells
Committed by Al Viro
1 parent a457ac2854

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -236,7 +236,7 @@
236 236  
237 237 if (dentry) {
238 238 spin_lock(&dentry->d_lock);
239   - if (!(d_unhashed(dentry) && dentry->d_inode)) {
  239 + if (!d_unhashed(dentry) && dentry->d_inode) {
240 240 dget_dlock(dentry);
241 241 __d_drop(dentry);
242 242 spin_unlock(&dentry->d_lock);