summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2014-03-29 20:39:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-26 17:13:18 -0700
commit04477075793234a9cd5411b3fe359f8506b0734e (patch)
tree424bfd18cc397afe8a4c64bc8bb95b6f39397372 /net
parent8c3911a71ede8ec4c29329c7a5a80c37b3aeb83e (diff)
rds: prevent dereference of a NULL device in rds_iw_laddr_check
[ Upstream commit bf39b4247b8799935ea91d90db250ab608a58e50 ] Binding might result in a NULL device which is later dereferenced without checking. Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/rds/iw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/iw.c b/net/rds/iw.c
index 7826d46baa70..589935661d66 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -239,7 +239,8 @@ static int rds_iw_laddr_check(__be32 addr)
ret = rdma_bind_addr(cm_id, (struct sockaddr *)&sin);
/* due to this, we will claim to support IB devices unless we
check node_type. */
- if (ret || cm_id->device->node_type != RDMA_NODE_RNIC)
+ if (ret || !cm_id->device ||
+ cm_id->device->node_type != RDMA_NODE_RNIC)
ret = -EADDRNOTAVAIL;
rdsdebug("addr %pI4 ret %d node type %d\n",