Infiniband: Fix potential NULL d_inode dereference
authorDavid Howells <dhowells@redhat.com>
Tue, 27 Jan 2015 15:01:18 +0000 (15:01 +0000)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 20 Feb 2015 09:56:45 +0000 (04:56 -0500)
commita95104fd3393080e8bcca348f51996f5f0f5ccb6
tree9773b427626ae8c40b7a511082b0a84b8ffe1579
parentfed0b588be2f55822013808a2968c228258d921b
Infiniband: Fix potential NULL d_inode dereference

Code that does this:

if (!(d_unhashed(tmp) && tmp->d_inode)) {
...
simple_unlink(parent->d_inode, tmp);
}

is broken because:

!(d_unhashed(tmp) && tmp->d_inode)

is equivalent to:

!d_unhashed(tmp) || !tmp->d_inode

so it is possible to get into simple_unlink() with tmp->d_inode == NULL.

simple_unlink(), however, assumes tmp->d_inode cannot be NULL.

I think that what was meant is this:

!d_unhashed(tmp) && tmp->d_inode

and that the logical-not operator or the final close-bracket was misplaced.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Bryan O'Sullivan <bos@pathscale.com>
cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/infiniband/hw/ipath/ipath_fs.c
drivers/infiniband/hw/qib/qib_fs.c