From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754621AbbDTIYZ (ORCPT ); Mon, 20 Apr 2015 04:24:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34214 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754524AbbDTIYY (ORCPT ); Mon, 20 Apr 2015 04:24:24 -0400 Date: Mon, 20 Apr 2015 10:24:15 +0200 From: Jiri Olsa To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , LKML , David Ahern Subject: Re: [PATCH 5/7] perf hists browser: Fix possible memory leak Message-ID: <20150420082415.GB9872@krava.redhat.com> References: <1429416255-12070-1-git-send-email-namhyung@kernel.org> <1429416255-12070-6-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1429416255-12070-6-git-send-email-namhyung@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 19, 2015 at 01:04:13PM +0900, Namhyung Kim wrote: > The options array saves strings for each popup menu item. The number of > items can be vary according to the currently selected item. So it can > leak some memory if it's exited from a small item. Fix it by freeing > all items when loop terminates. > > Signed-off-by: Namhyung Kim > --- > tools/perf/ui/browsers/hists.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index 8f303eb5044d..cace2df7e561 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -1691,7 +1691,8 @@ skip_annotation: > "Switch to another data file in PWD") > 0) > switch_data = nr_options++; > add_exit_option: > - options[nr_options++] = (char *)"Exit"; > + if (asprintf(&options[nr_options], "Exit") > 0) > + nr_options++; this one could cause segfault right? nice catch > retry_popup_menu: > choice = ui__popup_menu(nr_options, options); > > @@ -1812,7 +1813,7 @@ out_free_stack: > pstack__delete(fstack); > out: > hist_browser__delete(browser); > - free_popup_options(options, nr_options - 1); > + free_popup_options(options, ARRAY_SIZE(options)); > return key; > } > > -- > 2.3.5 >