diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2014-03-29 20:39:35 -0400 |
---|---|---|
committer | Stefan Bader <stefan.bader@canonical.com> | 2014-05-20 16:35:10 +0200 |
commit | c6cc0ef7c3679956aa458fe1c0faf33682fde2ad (patch) | |
tree | db517538bfcd4946503258a9e2c8d6e2a4f5d37b | |
parent | e448e1d63477031257b3d56b415d232cbc72bc01 (diff) | |
download | linux-2.6.32.y-drm33.z-c6cc0ef7c3679956aa458fe1c0faf33682fde2ad.tar.gz |
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: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
-rw-r--r-- | net/rds/iw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/iw.c b/net/rds/iw.c index db224f7c293711..bff1e4bab51b9b 100644 --- a/net/rds/iw.c +++ b/net/rds/iw.c @@ -237,7 +237,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", |