rdma: potential ERR_PTR dereference

PATCH Applied Dan Carpenter 3 participants 3 messages Apr 22, 2010

Subsystems (4)

Networking Network drivers Kernel janitors RDS - reliable datagram sockets

lore

Share & tools

lore

Dan Carpenter

author

2010-04-22 09:55 UTC #0 lore raw

PATCH 1/1 rdma: potential ERR_PTR dereference

In the original code, the "goto out" calls "rdma_destroy_id(cm_id);" That isn't needed here and would cause problems because "cm_id" is an ERR_PTR. The new code just returns directly.

Signed-off-by Dan Carpenter <[email protected]>

net/rds/rdma_transport.c +1 -1

index 9ece910..7b15508 100644
@@ -134,7 +134,7 @@ static int __init rds_rdma_listen_init(void)
 		ret = PTR_ERR(cm_id);
 		printk(KERN_ERR "RDS/RDMA: failed to setup listener, "
 		       "rdma_create_id() returned %d\n", ret);
-		goto out;
+		return ret;
 	}
 
 	sin.sin_family = AF_INET,

Andy Grover

Acked-by on v1 1/1

2010-04-22 17:28 UTC #1 lore raw

Quoted 5 lines · Dan Carpenter

In the original code, the "goto out" calls "rdma_destroy_id(cm_id);" That isn't needed here and would cause problems because "cm_id" is an ERR_PTR. The new code just returns directly.
Signed-off-by Dan Carpenter <[email protected]>

Thanks, Dan.

Acked-by Andy Grover <[email protected]>

-- Andy

David Miller

maintainer Applied

2010-04-22 22:57 UTC #2 lore raw

In reply to Dan Carpenter

From: Dan Carpenter <[email protected]>
Date: Thu, 22 Apr 2010 11:55:27 +0200

Quoted 5 lines

In the original code, the "goto out" calls "rdma_destroy_id(cm_id);" That isn't needed here and would cause problems because "cm_id" is an ERR_PTR. The new code just returns directly.
Signed-off-by Dan Carpenter <[email protected]>

Applied.