diff mbox

rds: prevent dereference of a NULL device in rds_iw_laddr_check

Message ID 1387581520-10272-1-git-send-email-sasha.levin@oracle.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Sasha Levin Dec. 20, 2013, 11:18 p.m. UTC
Binding might result in a NULL device which is later dereferenced
without checking.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
 net/rds/iw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Sergei Shtylyov Dec. 21, 2013, 12:31 a.m. UTC | #1
Hello.

On 12/21/2013 02:18 AM, Sasha Levin wrote:

> Binding might result in a NULL device which is later dereferenced
> without checking.

> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
> ---
>   net/rds/iw.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

> diff --git a/net/rds/iw.c b/net/rds/iw.c
> index 7826d46..0298920 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)

    Indent with tabs and then spaces, not with spaces only please, so that the 
line aligns under 'ret'.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/rds/iw.c b/net/rds/iw.c
index 7826d46..0298920 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",