RDS: check for valid rdma id before initiating connection

Connection could have been dropped while the route is being resolved
so check for valid rdma id before initiating the connection.

Orabug: 16857341

Signed-off-by: zheng.li <zheng.x.li@oracle.com>
(cherry picked from commit 5528367d56539f817182faa1f0ea35779ccac14e)

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index e756376ea7094f9bc6980178ba970304bc08db04..f7f87bb83b1602b3448cf50036955e53a95a6cc2 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -121,7 +121,18 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
        case RDMA_CM_EVENT_ROUTE_RESOLVED:
                /* XXX worry about racing with listen acceptance */
                conn->c_to_index = 0;
-               ret = trans->cm_initiate_connect(cm_id);
+
+               /* Connection could have been dropped so make sure the
+                * cm_id is valid before proceeding */
+               if (conn) {
+                       struct rds_ib_connection *ibic;
+
+                       ibic = conn->c_transport_data;
+                       if (ibic && ibic->i_cm_id == cm_id)
+                               ret = trans->cm_initiate_connect(cm_id);
+                       else
+                               rds_conn_drop(conn);
+               }
                break;
 
 #if RDMA_RDS_APM_SUPPORTED