summaryrefslogtreecommitdiff
path: root/net/rds/iw.c
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-14 06:50:04 -0700
commiteb3d1ebaa77c257872264015644f182c7888c021 (patch)
treea97936f4da06e774d4237e71f9d3c2af4a1ce12a /net/rds/iw.c
parentf9f80fa9755d955425d99220e018ac9618f642f5 (diff)
downloadlinux-stable-eb3d1ebaa77c257872264015644f182c7888c021.tar.gz
linux-stable-eb3d1ebaa77c257872264015644f182c7888c021.tar.bz2
linux-stable-eb3d1ebaa77c257872264015644f182c7888c021.zip
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/rds/iw.c')
-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",