IB/hfi1: Handle kzalloc failure in init_pervl_scs
Subsystems (2)
PATCH 1/1 IB/hfi1: Handle kzalloc failure in init_pervl_scs
Checking the return value of the memory allocation call in init_pervl_scs() was missed. Recently the kmalloc() was changed to kzalloc() which identified the problem.
While fixing this issue 2 other bugs were noticed. First, the array being allocated is accessed in the nomem path which can be reached before it is allocated. Second, kernel_send_context was not released on error. Fix both of these by creating a more common memory unwind label structure.
--- drivers/infiniband/hw/hfi1/pio.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hfi1/pio.c +16 -3
@@ -1952,13 +1952,17 @@ int init_pervl_scs(struct hfi1_devdata *dd) dd->vld[15 ].sc =sc_alloc (dd,SC_VL15 , dd->rcd[0 ]->rcvhdrqentsize, dd->node);if (!dd->vld[15 ].sc) - goto nomem; +return -ENOMEM ; +hfi1_init_ctxt (dd->vld[15 ].sc); dd->vld[15 ].mtu =enum_to_mtu (OPA_MTU_2048 ); dd->kernel_send_context =kzalloc_node (dd->num_send_contexts *sizeof (struct send_context *),GFP_KERNEL , dd->node); +if (!dd->kernel_send_context) + goto freesc15; + dd->kernel_send_context[0 ] = dd->vld[15 ].sc;for (i =0 ; i < num_vls; i++) {
@@ -2010,12 +2014,21 @@ int init_pervl_scs(struct hfi1_devdata *dd)if (pio_map_init (dd, ppd->port -1 , num_vls,NULL )) goto nomem;return 0 ; + nomem: -sc_free (dd->vld[15 ].sc); -for (i =0 ; i < num_vls; i++) +for (i =0 ; i < num_vls; i++) {sc_free (dd->vld[i].sc); + dd->vld[i].sc =NULL ; + } +for (i = num_vls; i <INIT_SC_PER_VL * num_vls; i++)sc_free (dd->kernel_send_context[i +1 ]); + +kfree (dd->kernel_send_context); + dd->kernel_send_context =NULL ; + +freesc15: +sc_free (dd->vld[15 ].sc);return -ENOMEM ; }
Signature · 6 lines
1.8.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
Doug Ledford
AppliedQuoted 14 lines · ira.weiny
Checking the return value of the memory allocation call in
init_pervl_scs()was missed. Recently thekmalloc()was changed tokzalloc()which identified the problem.While fixing this issue 2 other bugs were noticed. First, the array being allocated is accessed in the nomem path which can be reached before
it is allocated. Second,kernel_send_contextwas not released on error.
Fix both of these by creating a more common memory unwind label structure.Fixes 35f6befc8441 ("staging/rdma/hfi1: Add qp to send contextmapping for PIO")
Quoted 8 lines
Reported-by Leon Romanovsky <[email protected]>Reviewed-by Mike Marciniszyn <[email protected]>Signed-off-by Dennis Dalessandro <[email protected]>Signed-off-by Ira Weiny <[email protected]>---
drivers/infiniband/hw/hfi1/pio.c | 19 ++++++++++++++++---1 file changed, 16 insertions(+), 3 deletions(-)
Thanks, applied.
Signature · 2 lines
Doug Ledford <[email protected]> GPG KeyID: 0E572FDD