RE: [PATCH libi40iw] fix remaining potential leaks of info arrays and iwuqp
From: Tung, Chien Tin <hidden>
Date: 2016-07-28 21:10:07
Hi Jarod, Thank you for the patch, just a couple of things. Please send a V2 and we will include it.
quoted hunk
diff --git a/src/i40iw_uverbs.c b/src/i40iw_uverbs.c index ec5f77e..e5753e0100644--- a/src/i40iw_uverbs.c +++ b/src/i40iw_uverbs.c@@ -698,6 +698,7 @@ struct ibv_qp *i40iw_ucreate_qp(struct ibv_pd *pd,struct ibv_qp_init_attr *attr info.rq_wrid_array = calloc(rqdepth, sizeof(*info.rq_wrid_array)); if (!info.rq_wrid_array) { fprintf(stderr, PFX "%s: failed to allocate memory for RQ work array\n", __func__); + free(iwuqp);
[Chien] Not needed, see changes below.
quoted hunk
goto err_free_sq_wrtrk; }@@ -707,6 +708,7 @@ struct ibv_qp *i40iw_ucreate_qp(struct ibv_pd *pd,struct ibv_qp_init_attr *attr if (!status) { fprintf(stderr, PFX "%s: failed to map QP\n", __func__); + free(iwuqp);
[Chien] Not needed, see changes below.
quoted hunk
goto err_free_rq_wrid; } info.qp_id = resp.qp_id;@@ -728,12 +730,12 @@ struct ibv_qp *i40iw_ucreate_qp(struct ibv_pd *pd,struct ibv_qp_init_attr *attr err_destroy_qp: i40iw_udestroy_qp(&iwuqp->ibv_qp); - return NULL; - err_free_rq_wrid: free(info.rq_wrid_array); err_free_sq_wrtrk: free(info.sq_wrtrk_array); + return NULL;
[Chien] Need to remove this. We don't want to return when unwinding resources Same issue as the return NULL I missed.
+ err_destroy_lock: if (pthread_spin_destroy(&iwuqp->lock)) return NULL;
[Chien] Not sure why I would bother with the if statement here. Remove the if check and return NULL. Now everything should flow correctly in the error path.
-- 1.8.3.1
-- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html