From patchwork Wed May 18 17:44:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 9121561 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CA0E1BF29F for ; Wed, 18 May 2016 17:44:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8929C20107 for ; Wed, 18 May 2016 17:44:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50E502011B for ; Wed, 18 May 2016 17:44:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753135AbcERRoP (ORCPT ); Wed, 18 May 2016 13:44:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58525 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753131AbcERRoO (ORCPT ); Wed, 18 May 2016 13:44:14 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C652D47047; Wed, 18 May 2016 17:44:13 +0000 (UTC) Received: from hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com (hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com [10.16.184.47]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4IHiCNu017617; Wed, 18 May 2016 13:44:13 -0400 From: Jarod Wilson To: linux-rdma@vger.kernel.org Cc: Jarod Wilson , Gil Rockah Subject: [PATCH perftest] Fix assorted memory leaks on error paths Date: Wed, 18 May 2016 13:44:06 -0400 Message-Id: <1463593448-30864-1-git-send-email-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 18 May 2016 17:44:13 +0000 (UTC) Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clang noticed that we might leak mcg_params.ib_devname in failure paths. There are additional leaks after fixing this initial one that it still reported, here's hoping I've got them all now... 1. perftest-3.0/src/send_lat.c:232:3: warning: Potential leak of memory pointed to by 'mcg_params.ib_devname' # fprintf(stderr, " Couldn't get context for the device\n"); # ^ 4. perftest-3.0/src/send_lat.c:203:6: note: Assuming 'ret_val' is 0 # if (ret_val) { # ^~~~~~~ 7. perftest-3.0/src/send_lat.c:203:2: note: Taking false branch # if (ret_val) { # ^ 10. perftest-3.0/src/send_lat.c:209:5: note: Left side of '||' is false # if(user_param.use_xrc || user_param.connection_type == DC) { # ^ 13. perftest-3.0/src/send_lat.c:209:2: note: Taking false branch # if(user_param.use_xrc || user_param.connection_type == DC) { # ^ 16. perftest-3.0/src/send_lat.c:214:2: note: Taking false branch # if (user_param.connection_type == RawEth) { # ^ 19. perftest-3.0/src/send_lat.c:221:6: note: Assuming 'ib_dev' is non-null # if (!ib_dev) { # ^~~~~~~ 22. perftest-3.0/src/send_lat.c:221:2: note: Taking false branch # if (!ib_dev) { # ^ 25. perftest-3.0/src/send_lat.c:226:2: note: Taking true branch # if (user_param.use_mcg) # ^ 28. perftest-3.0/src/send_lat.c:227:3: note: Memory is allocated # GET_STRING(mcg_params.ib_devname,ibv_get_device_name(ib_dev)); # ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31. perftest-3.0/src/perftest_parameters.h:217:3: note: expanded from macro 'GET_STRING' # { ALLOCATE(orig,char,(strlen(temp) + 1)); strcpy(orig,temp); } # ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 34. perftest-3.0/src/perftest_parameters.h:212:20: note: expanded from macro 'ALLOCATE' # { if((var = (type*)malloc(sizeof(type)*(size))) == NULL) \ # ^~~~~~~~~~~~~~~~~~~~~~~~~~~ 37. perftest-3.0/src/send_lat.c:227:3: note: Taking false branch 38. perftest-3.0/src/perftest_parameters.h:217:3: note: expanded from macro 'GET_STRING' # { ALLOCATE(orig,char,(strlen(temp) + 1)); strcpy(orig,temp); } # ^ 41. perftest-3.0/src/perftest_parameters.h:212:3: note: expanded from macro 'ALLOCATE' # { if((var = (type*)malloc(sizeof(type)*(size))) == NULL) \ # ^ 44. perftest-3.0/src/send_lat.c:231:2: note: Taking true branch # if (!ctx.context) { # ^ 47. perftest-3.0/src/send_lat.c:232:3: note: Potential leak of memory pointed to by 'mcg_params.ib_devname' # fprintf(stderr, " Couldn't get context for the device\n"); # ^ # 230| ctx.context = ibv_open_device(ib_dev); # 231| if (!ctx.context) { # 232|-> fprintf(stderr, " Couldn't get context for the device\n"); # 233| return 1; # 234| } CC: Gil Rockah Signed-off-by: Jarod Wilson --- src/send_lat.c | 62 ++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/src/send_lat.c b/src/send_lat.c index bc194d8..e5beda9 100755 --- a/src/send_lat.c +++ b/src/send_lat.c @@ -230,19 +230,19 @@ int main(int argc, char *argv[]) ctx.context = ibv_open_device(ib_dev); if (!ctx.context) { fprintf(stderr, " Couldn't get context for the device\n"); - return 1; + goto failure; } /* See if MTU and link type are valid and supported. */ if (check_link(ctx.context,&user_param)) { fprintf(stderr, " Couldn't get context for the device\n"); - return FAILURE; + goto failure; } /* copy the relevant user parameters to the comm struct + creating rdma_cm resources. */ if (create_comm_struct(&user_comm,&user_param)) { fprintf(stderr," Unable to create RDMA_CM resources\n"); - return 1; + goto failure; } if (user_param.output == FULL_VERBOSITY && user_param.machine == SERVER) { @@ -254,7 +254,7 @@ int main(int argc, char *argv[]) /* Initialize the connection and print the local data. */ if (establish_connection(&user_comm)) { fprintf(stderr," Unable to init the socket connection\n"); - return FAILURE; + goto failure; } exchange_versions(&user_comm, &user_param); @@ -264,7 +264,7 @@ int main(int argc, char *argv[]) /* See if MTU and link type are valid and supported. */ if (check_mtu(ctx.context,&user_param, &user_comm)) { fprintf(stderr, " Couldn't get context for the device\n"); - return FAILURE; + goto failure; } /* Print basic test information. */ @@ -284,17 +284,17 @@ int main(int argc, char *argv[]) if (user_param.machine == CLIENT) { if (retry_rdma_connect(&ctx,&user_param)) { fprintf(stderr,"Unable to perform rdma_client function\n"); - return FAILURE; + goto failure2; } } else { if (create_rdma_resources(&ctx,&user_param)) { fprintf(stderr," Unable to create the rdma_resources\n"); - return FAILURE; + goto failure2; } if (rdma_server_connect(&ctx,&user_param)) { fprintf(stderr,"Unable to perform rdma_client function\n"); - return FAILURE; + goto failure2; } } @@ -303,14 +303,14 @@ int main(int argc, char *argv[]) /* create all the basic IB resources (data buffer, PD, MR, CQ and events channel) */ if (ctx_init(&ctx,&user_param)) { fprintf(stderr, " Couldn't create IB resources\n"); - return FAILURE; + goto failure2; } } /* Set up the Connection. */ if (send_set_up_connection(&ctx,&user_param,my_dest,&mcg_params,&user_comm)) { fprintf(stderr," Unable to set up socket connection\n"); - return 1; + goto failure2; } for (i=0; i < user_param.num_of_qps; i++) @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) /* shaking hands and gather the other side info. */ if (ctx_hand_shake(&user_comm,&my_dest[i],&rem_dest[i])) { fprintf(stderr,"Failed to exchange data between server and clients\n"); - return 1; + goto failure2; } ctx_print_pingpong_data(&rem_dest[i],&user_comm); @@ -332,7 +332,7 @@ int main(int argc, char *argv[]) if (ctx_check_gid_compatibility(&my_dest[0], &rem_dest[0])) { fprintf(stderr,"\n Found Incompatibility issue with GID types.\n"); fprintf(stderr," Please Try to use a different IP version.\n\n"); - return 1; + goto failure2; } } @@ -346,7 +346,7 @@ int main(int argc, char *argv[]) /* Request for Mcast group create registery in SM. */ if (join_multicast_group(SUBN_ADM_METHOD_SET,&mcg_params)) { fprintf(stderr," Failed to Join Mcast request\n"); - return 1; + goto failure; } } @@ -367,26 +367,26 @@ int main(int argc, char *argv[]) /* Prepare IB resources for rtr/rts. */ if (ctx_connect(&ctx,rem_dest,&user_param,my_dest)) { fprintf(stderr," Unable to Connect the HCA's through the link\n"); - return 1; + goto failure2; } } /* shaking hands and gather the other side info. */ if (ctx_hand_shake(&user_comm,&my_dest[0],&rem_dest[0])) { fprintf(stderr,"Failed to exchange data between server and clients\n"); - return 1; + goto failure; } if (user_param.use_event) { if (ibv_req_notify_cq(ctx.send_cq, 0)) { fprintf(stderr, "Couldn't request RCQ notification\n"); - return 1; + goto failure2; } if (ibv_req_notify_cq(ctx.recv_cq, 0)) { fprintf(stderr, "Couldn't request RCQ notification\n"); - return 1; + goto failure; } } if (user_param.output == FULL_VERBOSITY) { @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) /* Post receive recv_wqes fo current message size */ if (ctx_set_recv_wqes(&ctx,&user_param)) { fprintf(stderr," Failed to post receive recv_wqes\n"); - return 1; + goto failure2; } /* Sync between the client and server so the client won't send packets @@ -418,11 +418,15 @@ int main(int argc, char *argv[]) if (ctx_hand_shake(&user_comm,&my_dest[0],&rem_dest[0])) { fprintf(stderr,"Failed to exchange data between server and clients\n"); - return 1; + goto failure2; } - if(run_iter_lat_send(&ctx, &user_param)) + if(run_iter_lat_send(&ctx, &user_param)) { + free(my_dest); + free(rem_dest); + free(mcg_params.ib_devname); return 17; + } user_param.test_type == ITERATIONS ? print_report_lat(&user_param) : print_report_lat_duration(&user_param); } @@ -432,7 +436,7 @@ int main(int argc, char *argv[]) /* Post recevie recv_wqes fo current message size */ if (ctx_set_recv_wqes(&ctx,&user_param)) { fprintf(stderr," Failed to post receive recv_wqes\n"); - return 1; + goto failure2; } /* Sync between the client and server so the client won't send packets @@ -441,11 +445,15 @@ int main(int argc, char *argv[]) if (ctx_hand_shake(&user_comm,my_dest,rem_dest)) { fprintf(stderr,"Failed to exchange data between server and clients\n"); - return 1; + goto failure2; } - if(run_iter_lat_send(&ctx, &user_param)) + if(run_iter_lat_send(&ctx, &user_param)) { + free(my_dest); + free(rem_dest); + free(mcg_params.ib_devname); return 17; + } user_param.test_type == ITERATIONS ? print_report_lat(&user_param) : print_report_lat_duration(&user_param); } @@ -460,4 +468,12 @@ int main(int argc, char *argv[]) } return send_destroy_ctx(&ctx,&user_param,&mcg_params); + +failure2: + free(my_dest); + free(rem_dest); + destroy_ctx(&ctx,&user_param); +failure: + free(mcg_params.ib_devname); + return FAILURE; }