linux-kernel - Re: [PATCH v2 4/5] perf mem: Fill in the missing freeing a session after an error occur

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150630195749.GA3226@kernel.org>
Date:	Tue, 30 Jun 2015 16:57:49 -0300
From:	Arnaldo Carvalho de Melo <acme@...nel.org>
To:	Taeung Song <treeze.taeung@...il.com>
Cc:	linux-kernel@...r.kernel.org, jolsa@...hat.com,
	namhyung@...nel.org, Ingo Molnar <mingo@...hat.com>
Subject: Re: [PATCH v2 4/5] perf mem: Fill in the missing freeing a session
 after an error occur

Em Wed, Jul 01, 2015 at 12:18:45AM +0900, Taeung Song escreveu:
> When an error occur a error value is just returned
> without freeing the session. So allocating and freeing
> session have to be matched as a pair even if an error occur.
> 
> Signed-off-by: Taeung Song <treeze.taeung@...il.com>
> ---
>  tools/perf/builtin-mem.c | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
> index da2ec06..a914ef7 100644
> --- a/tools/perf/builtin-mem.c
> +++ b/tools/perf/builtin-mem.c
> @@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem)
>  		.mode = PERF_DATA_MODE_READ,
>  		.force = mem->force,
>  	};
> -	int err = -EINVAL;
>  	int ret;
>  	struct perf_session *session = perf_session__new(&file, false,
>  							 &mem->tool);
> @@ -135,24 +134,23 @@ static int report_raw_events(struct perf_mem *mem)
>  	if (mem->cpu_list) {
>  		ret = perf_session__cpu_bitmap(session, mem->cpu_list,
>  					       mem->cpu_bitmap);
> -		if (ret)
> +		if (ret) {
> +			ret = -EINVAL;

Why not propagate perf_session__cpu_bitmap() return, this function
wasn't being consistent in returning errors, neither was you, as, see
below...

>  			goto out_delete;
> +		}
>  	}
>  
> -	if (symbol__init(&session->header.env) < 0)
> -		return -1;
> +	ret = symbol__init(&session->header.env);
> +	if (ret < 0)
> +		goto out_delete;

Here you decided to propagate symbol__init() error return. :-)

I applied all the others, including the 3/5 v2 one.

Thanks,

- Arnaldo

>  
>  	printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
>  
> -	err = perf_session__process_events(session);
> -	if (err)
> -		return err;
> -
> -	return 0;
> +	ret = perf_session__process_events(session);
>  
>  out_delete:
>  	perf_session__delete(session);
> -	return err;
> +	return ret;
>  }
>  
>  static int report_events(int argc, const char **argv, struct perf_mem *mem)
> -- 
> 1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/