32 lines
1015 B
Diff
32 lines
1015 B
Diff
Bugzilla: 1083280
|
|
Upstream-status: Queued for 3.15
|
|
|
|
From bf39b4247b8799935ea91d90db250ab608a58e50 Mon Sep 17 00:00:00 2001
|
|
From: Sasha Levin <sasha.levin@oracle.com>
|
|
Date: Sat, 29 Mar 2014 20:39:35 -0400
|
|
Subject: rds: prevent dereference of a NULL device in rds_iw_laddr_check
|
|
|
|
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>
|
|
|
|
diff --git a/net/rds/iw.c b/net/rds/iw.c
|
|
index 7826d46..5899356 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",
|
|
--
|
|
cgit v0.10.1
|
|
|