[PATCH] perf build-id: Fix filename size calculation

[PATCH] perf build-id: Fix filename size calculation

[Namhyung Kim]

The filename is a pointer variable so the sizeof(filename) will return
length of a pointer. Fix it by using 'size'.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 tools/perf/util/header.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 4c7c2d73251f..c0b70c697a36 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -296,7 +296,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
 	if (mkdir_p(filename, 0755))
 		goto out_free;
 
-	snprintf(filename + len, sizeof(filename) - len, "/%s", sbuild_id);
+	snprintf(filename + len, size - len, "/%s", sbuild_id);
 
 	if (access(filename, F_OK)) {
 		if (is_kallsyms) {
-- 
1.7.9.2

Re: [PATCH] perf build-id: Fix filename size calculation

[Arnaldo Carvalho de Melo]

Em Tue, May 01, 2012 at 11:19:36PM +0900, Namhyung Kim escreveu:
> The filename is a pointer variable so the sizeof(filename) will return
> length of a pointer. Fix it by using 'size'.

Applied.

The code worked because the snprintf buffer size parameter would always
be bigger (negative) than the sbuild_id lenght, and all fitted in the
filename allocated space. :-)

- Arnaldo
 
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
>  tools/perf/util/header.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 4c7c2d73251f..c0b70c697a36 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -296,7 +296,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
>  	if (mkdir_p(filename, 0755))
>  		goto out_free;
>  
> -	snprintf(filename + len, sizeof(filename) - len, "/%s", sbuild_id);
> +	snprintf(filename + len, size - len, "/%s", sbuild_id);
>  
>  	if (access(filename, F_OK)) {
>  		if (is_kallsyms) {
> -- 
> 1.7.9.2

[tip:perf/urgent] perf build-id: Fix filename size calculation

[tip-bot for Namhyung Kim]

Commit-ID:  afda0f94483f46a4caddb529b8f95e0aaf015de6
Gitweb:     http://git.kernel.org/tip/afda0f94483f46a4caddb529b8f95e0aaf015de6
Author:     Namhyung Kim <namhyung@gmail.com>
AuthorDate: Tue, 1 May 2012 23:19:36 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 1 May 2012 14:13:00 -0300

perf build-id: Fix filename size calculation

The filename is a pointer variable so the sizeof(filename) will return
length of a pointer. Fix it by using 'size'.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335881976-3282-1-git-send-email-namhyung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/header.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 4c7c2d7..c0b70c6 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -296,7 +296,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
 	if (mkdir_p(filename, 0755))
 		goto out_free;
 
-	snprintf(filename + len, sizeof(filename) - len, "/%s", sbuild_id);
+	snprintf(filename + len, size - len, "/%s", sbuild_id);
 
 	if (access(filename, F_OK)) {
 		if (is_kallsyms) {