perf evsel: Ensure the fallback message is always written to
Ian Rogers
reviewerPATCH 1/2 perf evsel: Ensure the fallback message is always written to
The fallback message is unconditionally printed in places like record__open. If no fallback is attempted this can lead to printing uninitialized data, crashes, etc.
--- tools/perf/util/evsel.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
tools/perf/util/evsel.c +7 -5
@@ -3565,7 +3565,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* If event has exclude user then don't exclude kernel. */ if (evsel->core.attr.exclude_user) -return false; + goto no_fallback;/* Is there already the separator in the name. */ if (strchr(name, '/') ||
@@ -3573,7 +3573,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, sep ="" ;if (asprintf (&new_name,"%s%su" , name, sep) <0 ) -return false; + goto no_fallback;free (evsel->name); evsel->name = new_name;
@@ -3596,17 +3596,19 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, sep ="" ;if (asprintf (&new_name,"%s%sH" , name, sep) <0 ) -return false; + goto no_fallback;free (evsel->name); evsel->name = new_name;/* Apple M1 requires exclude_guest */ -scnprintf (msg, msgsize,"trying to fall back to excluding guest samples" ); +scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ;return true; } - +no_fallback: +scnprintf (msg, msgsize,"No fallback found for '%s' for error %d" , +evsel__name (evsel), err);return false; }
Signature · 1 line
2.51.0.470.ga7dc726c21-goog
Ian Rogers
reviewerPATCH 2/2 perf build-id: Ensure snprintf string is empty when size is 0
The string result of build_id__snprintf is unconditionally used in places like dsos__fprintf_buildid_cb. If the build id has size 0 then this creates a use of uninitialized memory. Add null termination for the size 0 case.
A similar fix was written by Jiri Olsa in commit 6311951d4f8f ("perf
tools: Initialize output buffer in build_id__sprintf") but lost in the transition to snprintf.
--- tools/perf/util/build-id.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/util/build-id.c +7 -0
@@ -86,6 +86,13 @@ int build_id__snprintf(const struct build_id *build_id, char *bf, size_t bf_size {size_t offs =0 ; +if (build_id->size ==0 ) { +/* Ensure bf is always \0 terminated. */ +if (bf_size >0 ) + bf[0 ] ='\0' ; +return 0 ; + } +for (size_t i =0 ; i < build_id->size && offs < bf_size; ++i) offs +=snprintf (bf + offs, bf_size - offs,"%02x" , build_id->data[i]);
Signature · 1 line
2.51.0.470.ga7dc726c21-goog
Quoted 6 lines · Ian Rogers
The fallback message is unconditionally printed in places like
record__open. If no fallback is attempted this can lead to printing uninitialized data, crashes, etc.Fixes c0a54341c0e8 ("perf evsel: Introduce event fallback method")Signed-off-by Ian Rogers <[email protected]>
Thanks, applied to perf-tools-next,
- Arnaldo
Quoted 51 lines
--- tools/perf/util/evsel.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)tools/perf/util/evsel.c +7
-5@@ -3565,7 +3565,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err,/* If event has exclude user then don't exclude kernel. */ if (evsel->core.attr.exclude_user) -return false; + goto no_fallback;/* Is there already the separator in the name. */ if (strchr(name, '/') ||@@ -3573,7 +3573,7 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, sep ="" ;if (asprintf (&new_name,"%s%su" , name, sep) <0 ) -return false; + goto no_fallback;free (evsel->name); evsel->name = new_name;@@ -3596,17 +3596,19 @@ bool evsel__fallback(struct evsel *evsel, struct target *target, int err, sep ="" ;if (asprintf (&new_name,"%s%sH" , name, sep) <0 ) -return false; + goto no_fallback;free (evsel->name); evsel->name = new_name;/* Apple M1 requires exclude_guest */ -scnprintf (msg, msgsize,"trying to fall back to excluding guest samples" ); +scnprintf (msg, msgsize,"Trying to fall back to excluding guest samples" ); evsel->core.attr.exclude_guest =1 ;return true; } - +no_fallback: +scnprintf (msg, msgsize,"No fallback found for '%s' for error %d" , +evsel__name (evsel), err);return false; }Signature · 1 line
2.51.0.470.ga7dc726c21-goog