Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9256b251 authored by Faisal Latif's avatar Faisal Latif Committed by Roland Dreier
Browse files

RDMA/nes: Fix error path in nes_accept() 



If reg_phys_mem() fails, we need to free memory allocated for MPA
frame with private data before returning the error. Also move
nes_add_ref() after the reg_phys_mem() is successful.

Signed-off-by: default avatarFaisal Latif <faisal.latif@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 109d67e4

drivers/infiniband/hw/nes/nes_cm.c

+4 −1
Original line number Diff line number Diff line
@@ -2705,7 +2705,6 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
	/* associate the node with the QP */

	nesqp->cm_node = (void *)cm_node;

	cm_node->nesqp = nesqp;

	nes_add_ref(&nesqp->ibqp);



	nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",

		nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
@@ -2758,6 +2757,9 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
			nes_debug(NES_DBG_CM, "Unable to register memory region"

					"for lSMM for cm_node = %p \n",

					cm_node);

			pci_free_consistent(nesdev->pcidev,

				nesqp->private_data_len+sizeof(struct ietf_mpa_frame),

				nesqp->ietf_frame, nesqp->ietf_frame_pbase);

			return -ENOMEM;

		}
@@ -2874,6 +2876,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 


	/* notify OF layer that accept event was successful */

	cm_id->add_ref(cm_id);

	nes_add_ref(&nesqp->ibqp);



	cm_event.event = IW_CM_EVENT_ESTABLISHED;

	cm_event.status = IW_CM_EVENT_STATUS_ACCEPTED;