IB/cm: Use correct reject code for invalid GID
Set the reject code properly when rejecting a request that contains an invalid GID. A suitable GID is returned by the IB CM in the additional reject information (ARI). This is a spec compliancy issue. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
c1f250c0b4
commit
76842405fc
|
@ -1354,7 +1354,7 @@ static int cm_req_handler(struct cm_work *work)
|
||||||
id.local_id);
|
id.local_id);
|
||||||
if (IS_ERR(cm_id_priv->timewait_info)) {
|
if (IS_ERR(cm_id_priv->timewait_info)) {
|
||||||
ret = PTR_ERR(cm_id_priv->timewait_info);
|
ret = PTR_ERR(cm_id_priv->timewait_info);
|
||||||
goto error1;
|
goto destroy;
|
||||||
}
|
}
|
||||||
cm_id_priv->timewait_info->work.remote_id = req_msg->local_comm_id;
|
cm_id_priv->timewait_info->work.remote_id = req_msg->local_comm_id;
|
||||||
cm_id_priv->timewait_info->remote_ca_guid = req_msg->local_ca_guid;
|
cm_id_priv->timewait_info->remote_ca_guid = req_msg->local_ca_guid;
|
||||||
|
@ -1363,7 +1363,8 @@ static int cm_req_handler(struct cm_work *work)
|
||||||
listen_cm_id_priv = cm_match_req(work, cm_id_priv);
|
listen_cm_id_priv = cm_match_req(work, cm_id_priv);
|
||||||
if (!listen_cm_id_priv) {
|
if (!listen_cm_id_priv) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto error2;
|
kfree(cm_id_priv->timewait_info);
|
||||||
|
goto destroy;
|
||||||
}
|
}
|
||||||
|
|
||||||
cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;
|
cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;
|
||||||
|
@ -1373,12 +1374,22 @@ static int cm_req_handler(struct cm_work *work)
|
||||||
|
|
||||||
cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
|
cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
|
||||||
ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av);
|
ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av);
|
||||||
if (ret)
|
if (ret) {
|
||||||
goto error3;
|
ib_get_cached_gid(work->port->cm_dev->device,
|
||||||
|
work->port->port_num, 0, &work->path[0].sgid);
|
||||||
|
ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_GID,
|
||||||
|
&work->path[0].sgid, sizeof work->path[0].sgid,
|
||||||
|
NULL, 0);
|
||||||
|
goto rejected;
|
||||||
|
}
|
||||||
if (req_msg->alt_local_lid) {
|
if (req_msg->alt_local_lid) {
|
||||||
ret = cm_init_av_by_path(&work->path[1], &cm_id_priv->alt_av);
|
ret = cm_init_av_by_path(&work->path[1], &cm_id_priv->alt_av);
|
||||||
if (ret)
|
if (ret) {
|
||||||
goto error3;
|
ib_send_cm_rej(cm_id, IB_CM_REJ_INVALID_ALT_GID,
|
||||||
|
&work->path[0].sgid,
|
||||||
|
sizeof work->path[0].sgid, NULL, 0);
|
||||||
|
goto rejected;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cm_id_priv->tid = req_msg->hdr.tid;
|
cm_id_priv->tid = req_msg->hdr.tid;
|
||||||
cm_id_priv->timeout_ms = cm_convert_to_ms(
|
cm_id_priv->timeout_ms = cm_convert_to_ms(
|
||||||
|
@ -1400,12 +1411,11 @@ static int cm_req_handler(struct cm_work *work)
|
||||||
cm_deref_id(listen_cm_id_priv);
|
cm_deref_id(listen_cm_id_priv);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
error3: atomic_dec(&cm_id_priv->refcount);
|
rejected:
|
||||||
|
atomic_dec(&cm_id_priv->refcount);
|
||||||
cm_deref_id(listen_cm_id_priv);
|
cm_deref_id(listen_cm_id_priv);
|
||||||
cm_cleanup_timewait(cm_id_priv->timewait_info);
|
destroy:
|
||||||
error2: kfree(cm_id_priv->timewait_info);
|
ib_destroy_cm_id(cm_id);
|
||||||
cm_id_priv->timewait_info = NULL;
|
|
||||||
error1: ib_destroy_cm_id(&cm_id_priv->id);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue