IB/cm: Fix memory corruption in handling CM request
Subsystems (2)
PATCH 1/1 IB/cm: Fix memory corruption in handling CM request
From: Parav Pandit <parav-VPRAkNaXOzVWk0Htik3J/[email protected]>
In recent code, two path record entries are alwasy cleared while allocated could be either one or two path record entries. This leads to zero out of unallocated memory.
This fix initializes alternative path record only when alternative path is set.
While we are at it, path record allocation doesn't check for OPA alternative path, but rest of the code checks for OPA alternative path. Path record allocation code doesn't check for OPA alternative LID. This can further lead to memory corruption when only one path record is allocated, but there is actually alternative OPA path record present in CM request.
--- drivers/infiniband/core/cm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/infiniband/core/cm.c +7 -4
@@ -1573,7 +1573,7 @@ static void cm_format_req_event(struct cm_work *work, param->bth_pkey =cm_get_bth_pkey (work); param->port = cm_id_priv->av.port->port_num; param->primary_path = &work->path[0 ]; -if (req_msg->alt_local_lid) +if (cm_req_has_alt_path (req_msg)) param->alternate_path = &work->path[1 ];else param->alternate_path =NULL ;
@@ -1854,7 +1854,8 @@ static int cm_req_handler(struct cm_work *work)cm_process_routed_req (req_msg, work->mad_recv_wc->wc);memset (&work->path[0 ],0 ,sizeof (work->path[0 ])); -memset (&work->path[1 ],0 ,sizeof (work->path[1 ])); +if (cm_req_has_alt_path (req_msg)) +memset (&work->path[1 ],0 ,sizeof (work->path[1 ])); grh =rdma_ah_read_grh (&cm_id_priv->av.ah_attr); ret = ib_get_cached_gid(work->port->cm_dev->ib_device, work->port->port_num,
@@ -3816,14 +3817,16 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,struct cm_port *port = mad_agent->context;struct cm_work *work;enum ib_cm_event_type event; +bool alt_path = false;u16 attr_id;int paths =0 ;int going_down =0 ;switch (mad_recv_wc->recv_buf.mad->mad_hdr.attr_id) {case CM_REQ_ATTR_ID : - paths =1 + (((struct cm_req_msg *) mad_recv_wc->recv_buf.mad)-> - alt_local_lid !=0 ); + alt_path =cm_req_has_alt_path ((struct cm_req_msg *) + mad_recv_wc->recv_buf.mad); + paths =1 + (alt_path !=0 ); event =IB_CM_REQ_RECEIVED ;break ;case CM_MRA_ATTR_ID :
--
2.14.2
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20171019054030.13280-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Doug Ledford
AppliedQuoted 20 lines · Leon Romanovsky
From: Parav Pandit <parav-VPRAkNaXOzVWk0Htik3J/[email protected]>
In recent code, two path record entries are alwasy cleared while allocated could be either one or two path record entries. This leads to zero out of unallocated memory.
This fix initializes alternative path record only when alternative path
is set.While we are at it, path record allocation doesn't check for OPA alternative path, but rest of the code checks for OPA alternative path.
Path record allocation code doesn't check for OPA alternative LID. This can further lead to memory corruption when only one path record is
allocated, but there is actually alternative OPA path record present in CM
request.
Quoted 6 lines
Cc <[email protected]> # v4.12+Fixes 9fdca4da4d8c ("IB/SA: Split struct sa_path_rec based on IB andROCE specific fields")
Signed-off-by Leon Romanovsky <[email protected]>
Thanks, applied.
Signature · 8 lines
Doug Ledford <[email protected]> GPG KeyID: B826A3330E572FDD Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html