Patch "IB/cm: Fix memory corruption in handling CM request" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
IB/cm: Fix memory corruption in handling CM request
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-cm-fix-memory-corruption-in-handling-cm-request.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
5a3dc32372439eb9a0d6027c54cbfff64803fce5Mon Sep 17 00:00:00 2001
From: Parav Pandit <[email protected]>
Date: Thu, 19 Oct 2017 08:40:30 +0300
Subject: IB/cm: Fix memory corruption in handling CM request
From: Parav Pandit <[email protected]>
commit 5a3dc32372439eb9a0d6027c54cbfff64803fce5 upstream.
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
@@ -1575,7 +1575,7 @@ static void cm_format_req_event(struct c 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 ;
@@ -1856,7 +1856,8 @@ static int cm_req_handler(struct cm_workcm_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,
@@ -3817,14 +3818,16 @@ static void cm_recv_handler(struct ib_mastruct 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 :
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/ib-core-only-maintain-real-qps-in-the-security-lists.patch queue-4.14/ib-cm-fix-memory-corruption-in-handling-cm-request.patch queue-4.14/ib-core-avoid-crash-on-pkey-enforcement-failed-in-received-mads.patch