perf ftrace: Proper error clean up in print_profile_result
Ian Rogers
reviewerPATCH 1/1 perf ftrace: Proper error clean up in print_profile_result
The ftrace profile_hash is cleaned up on success but not on memory allocation and empty paths. Fix by running the clean up for all. Free the profile too, so make it NULL, just for clarity that this is all clean up code.
--- tools/perf/builtin-ftrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/builtin-ftrace.c +5 -3
@@ -18,6 +18,7 @@#include <poll.h> #include <ctype.h> #include <linux/capability.h> +#include <linux/err.h> #include <linux/string.h> #include <sys/stat.h>
@@ -1369,17 +1370,17 @@ static int cmp_profile_data(const void *a, const void *b)static void print_profile_result (struct perf_ftrace *ftrace) { -struct hashmap_entry *entry, **profile; +struct hashmap_entry *entry, **profile =NULL ;size_t i, nr, bkt; nr =hashmap__size (ftrace->profile_hash);if (nr ==0 ) -return ; + goto out; profile =calloc (nr,sizeof (*profile));if (profile ==NULL ) {pr_err ("failed to allocate memory for the result\n" ); -return ; + goto out; } i =0 ;
@@ -1403,6 +1404,7 @@ static void print_profile_result(struct perf_ftrace *ftrace) p->st.max / 1000, p->st.max % 1000, p->st.n, name); } +out:free (profile);hashmap__for_each_entry (ftrace->profile_hash, entry, bkt) {
Signature · 1 line
2.53.0.473.g4a7958ca14-goog
Ian Rogers
reviewerQuoted 7 lines · Ian Rogers
The ftrace
profile_hashis cleaned up on success but not on memory allocation and empty paths. Fix by running the clean up for all. Free the profile too, so make it NULL, just for clarity that this is all clean up code.Signed-off-by Ian Rogers <[email protected]>
Ping.
Thanks,
Ian
Quoted 48 lines
--- tools/perf/builtin-ftrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)tools/perf/builtin-ftrace.c +5
-4@@ -18,6 +18,7 @@#include <poll.h> #include <ctype.h> #include <linux/capability.h> +#include <linux/err.h> #include <linux/string.h> #include <sys/stat.h> @@ -1369,17 +1370,17 @@ static int cmp_profile_data(const void *a, const void *b)static void print_profile_result (struct perf_ftrace *ftrace) { -struct hashmap_entry *entry, **profile; +struct hashmap_entry *entry, **profile =NULL ;size_t i, nr, bkt; nr =hashmap__size (ftrace->profile_hash);if (nr ==0 ) -return ; + goto out; profile =calloc (nr,sizeof (*profile));if (profile ==NULL ) {pr_err ("failed to allocate memory for the result\n" ); -return ; + goto out; } i =0 ;@@ -1403,6 +1404,7 @@ static void print_profile_result(struct perf_ftrace *ftrace) p->st.max / 1000, p->st.max % 1000, p->st.n, name); } +out:free (profile);hashmap__for_each_entry (ftrace->profile_hash, entry, bkt) { --2.53.0.473.g4a7958ca14-goog
Ian Rogers
reviewerQuoted 11 lines · Ian Rogers
Quoted 7 lines · Ian Rogers
The ftrace
profile_hashis cleaned up on success but not on memory allocation and empty paths. Fix by running the clean up for all. Free the profile too, so make it NULL, just for clarity that this is all clean up code.Signed-off-by Ian Rogers <[email protected]>Ping.
Ping.
Thanks,
Ian
Quoted 51 lines
Thanks,
IanQuoted 48 lines
--- tools/perf/builtin-ftrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)tools/perf/builtin-ftrace.c +5
-4@@ -18,6 +18,7 @@#include <poll.h> #include <ctype.h> #include <linux/capability.h> +#include <linux/err.h> #include <linux/string.h> #include <sys/stat.h> @@ -1369,17 +1370,17 @@ static int cmp_profile_data(const void *a, const void *b)static void print_profile_result (struct perf_ftrace *ftrace) { -struct hashmap_entry *entry, **profile; +struct hashmap_entry *entry, **profile =NULL ;size_t i, nr, bkt; nr =hashmap__size (ftrace->profile_hash);if (nr ==0 ) -return ; + goto out; profile =calloc (nr,sizeof (*profile));if (profile ==NULL ) {pr_err ("failed to allocate memory for the result\n" ); -return ; + goto out; } i =0 ;@@ -1403,6 +1404,7 @@ static void print_profile_result(struct perf_ftrace *ftrace) p->st.max / 1000, p->st.max % 1000, p->st.n, name); } +out:free (profile);hashmap__for_each_entry (ftrace->profile_hash, entry, bkt) { --2.53.0.473.g4a7958ca14-goog
Namhyung Kim
maintainerQuoted 9 lines · Ian Rogers
Quoted 8 lines · Ian Rogers
Quoted 6 lines · Ian Rogers
The ftrace
profile_hashis cleaned up on success but not on memory allocation and empty paths. Fix by running the clean up for all. Free the profile too, so make it NULL, just for clarity that this is all clean up code.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>Ping.
Ping.
Sorry for the delay. Can you please rebase the change? It doesn't apply anymore.
Thanks,
Namhyung