Skip to content

Commit

Permalink
RDS/IB: rds_ib_cm_handle_connect() forgot to unlock c_cm_lock
Browse files Browse the repository at this point in the history
rds_ib_cm_handle_connect() could return without unlocking the c_conn_lock if
rds_setup_qp() failed.  Rather than adding another imbalanced mutex_unlock() to
this error path we only unlock the mutex once as we exit the function, reducing
the likelyhood of making this same mistake in the future.  We remove the
previous mulitple return sites, leaving one unambigious return path.

Signed-off-by: Zach Brown <zach.brown@oracle.com>
  • Loading branch information
Zach Brown authored and Andy Grover committed Sep 9, 2010
1 parent 1cc2228 commit a46ca94
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions net/rds/ib_cm.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
struct rds_ib_connection *ic = NULL;
struct rdma_conn_param conn_param;
u32 version;
int err, destroy = 1;
int err = 1, destroy = 1;

/* Check whether the remote protocol version matches ours. */
version = rds_ib_protocol_compatible(event);
Expand Down Expand Up @@ -467,7 +467,6 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
/* Wait and see - our connect may still be succeeding */
rds_ib_stats_inc(s_ib_connect_raced);
}
mutex_unlock(&conn->c_cm_lock);
goto out;
}

Expand Down Expand Up @@ -504,16 +503,14 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,

/* rdma_accept() calls rdma_reject() internally if it fails */
err = rdma_accept(cm_id, &conn_param);
mutex_unlock(&conn->c_cm_lock);
if (err) {
if (err)
rds_ib_conn_error(conn, "rdma_accept failed (%d)\n", err);
goto out;
}

return 0;

out:
rdma_reject(cm_id, NULL, 0);
if (conn)
mutex_unlock(&conn->c_cm_lock);
if (err)
rdma_reject(cm_id, NULL, 0);
return destroy;
}

Expand Down

0 comments on commit a46ca94

Please sign in to comment.