Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95104fd authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
cc: Bryan O'Sullivan <bos@pathscale.com>
cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent fed0b588

drivers/infiniband/hw/ipath/ipath_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int remove_file(struct dentry *parent, char *name) 
	}



	spin_lock(&tmp->d_lock);

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

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

		dget_dlock(tmp);

		__d_drop(tmp);

		spin_unlock(&tmp->d_lock);

drivers/infiniband/hw/qib/qib_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int remove_file(struct dentry *parent, char *name) 
	}



	spin_lock(&tmp->d_lock);

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

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

		__d_drop(tmp);

		spin_unlock(&tmp->d_lock);

		simple_unlink(parent->d_inode, tmp);