Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1415418

Re: [BUGFIX][PATCH v6 2/9] perf config: If collect_config() is failed, finally free a config set after it is done

Show all headers | View raw

Em Mon, Jun 06, 2016 at 07:52:53PM +0900, Taeung Song escreveu:
> Because of die() at perf_parse_file() a config set was freed
> in collect_config(), if failed.
> But it is natural to free a config set after collect_config() is done
> when some problems happened.
> 
> So, in case of failure, lastly free a config set at perf_config_set__new()
> instead of freeing the config set in collect_config().
> 
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Jiri Olsa <jolsa@redhat.com>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> ---
>  tools/perf/util/config.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index b500737..d013f90 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -639,7 +639,6 @@ static int collect_config(const char *var, const char *value,
>  
>  out_free:
>  	free(key);
> -	perf_config_set__delete(set);
>  	return -1;
>  }
>  
> @@ -649,7 +648,8 @@ struct perf_config_set *perf_config_set__new(void)
>  
>  	if (set) {
>  		INIT_LIST_HEAD(&set->sections);
> -		perf_config(collect_config, set);
> +		if (perf_config(collect_config, set) < 0)
> +			perf_config_set__delete(set);
>  	}
>  
>  	return set;

You can't do that, there is something missing, without looking at the
code I think you need:

 	if (set) {
 		INIT_LIST_HEAD(&set->sections);
-		perf_config(collect_config, set);
+		if (perf_config(collect_config, set) < 0) {
+			perf_config_set__delete(set);
+			set = NULL;
+		}
 	}
 
 	return set;

No?

- Arnaldo

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[BUGFIX][PATCH v6 2/9] perf config: If collect_config() is failed, finally free a config set after it is done Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 13:00 +0200
  Re: [BUGFIX][PATCH v6 2/9] perf config: If collect_config() is  failed, finally free a config set after it is done Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-06 22:30 +0200
    Re: [BUGFIX][PATCH v6 2/9] perf config: If collect_config() is  failed, finally free a config set after it is done Taeung Song <treeze.taeung@gmail.com> - 2016-06-06 23:40 +0200
      Re: [BUGFIX][PATCH v6 2/9] perf config: If collect_config() is  failed, finally free a config set after it is done Taeung Song <treeze.taeung@gmail.com> - 2016-06-07 09:50 +0200

csiph-web