linux-kernel - Re: [PATCH 02/11] perf tools: fix path unpopulated in machine__create

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] [day] [month] [year] [list]

Message-ID: <20130919144943.GE17742@ghostprotocols.net>
Date:	Thu, 19 Sep 2013 11:49:43 -0300
From:	Arnaldo Carvalho de Melo <acme@...stprotocols.net>
To:	Adrian Hunter <adrian.hunter@...el.com>
Cc:	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	linux-kernel@...r.kernel.org, David Ahern <dsahern@...il.com>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Jiri Olsa <jolsa@...hat.com>, Mike Galbraith <efault@....de>,
	Namhyung Kim <namhyung@...il.com>,
	Paul Mackerras <paulus@...ba.org>,
	Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCH 02/11] perf tools: fix path unpopulated in
 machine__create_modules()

Em Mon, Sep 16, 2013 at 01:52:43PM +0300, Adrian Hunter escreveu:
> In machine__create_modules() the 'path' char array
> was used in a call to symbol__restricted_filename()
> without always being populated.

Isn't this equivalent and shorter?

[acme@zoo linux]$ git diff
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 933d14f..6188d28 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -792,7 +792,7 @@ static int machine__create_modules(struct machine *machine)
                modules = path;
        }
 
-       if (symbol__restricted_filename(path, "/proc/modules"))
+       if (symbol__restricted_filename(modules, "/proc/modules"))
                return -1;
 
        file = fopen(modules, "r");
[acme@zoo linux]$ 

- Arnaldo

> Signed-off-by: Adrian Hunter <adrian.hunter@...el.com>
> ---
>  tools/perf/util/machine.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index 933d14f..1ae917c 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -782,20 +782,17 @@ static int machine__create_modules(struct machine *machine)
>  	size_t n;
>  	FILE *file;
>  	struct map *map;
> -	const char *modules;
>  	char path[PATH_MAX];
>  
>  	if (machine__is_default_guest(machine))
> -		modules = symbol_conf.default_guest_modules;
> -	else {
> -		sprintf(path, "%s/proc/modules", machine->root_dir);
> -		modules = path;
> -	}
> +		strncpy(path, symbol_conf.default_guest_modules, PATH_MAX);
> +	else
> +		snprintf(path, PATH_MAX, "%s/proc/modules", machine->root_dir);
>  
>  	if (symbol__restricted_filename(path, "/proc/modules"))
>  		return -1;
>  
> -	file = fopen(modules, "r");
> +	file = fopen(path, "r");
>  	if (file == NULL)
>  		return -1;
>  
> -- 
> 1.7.11.7
--
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/