From: Sasha Levin Date: Sun, 29 Dec 2019 02:20:02 +0000 (-0500) Subject: Drop perf-parse-fix-potential-memory-leak-when-handling-t.patch X-Git-Tag: v4.14.161~17^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e1715800a8dc4b135dedcf5f6ec8e4a6fa2e00;p=thirdparty%2Fkernel%2Fstable-queue.git Drop perf-parse-fix-potential-memory-leak-when-handling-t.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/perf-parse-fix-potential-memory-leak-when-handling-t.patch b/queue-4.14/perf-parse-fix-potential-memory-leak-when-handling-t.patch deleted file mode 100644 index 5462da88305..00000000000 --- a/queue-4.14/perf-parse-fix-potential-memory-leak-when-handling-t.patch +++ /dev/null @@ -1,85 +0,0 @@ -From e9dcd4f57568ed3a4198a56fb739f2ec87dcc87b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Nov 2019 10:09:25 -0800 -Subject: perf parse: Fix potential memory leak when handling tracepoint errors - -From: Ian Rogers - -[ Upstream commit 4584f084aa9d8033d5911935837dbee7b082d0e9 ] - -An error may be in place when tracepoint_error is called, use -parse_events__handle_error to avoid a memory leak and to capture the -first and last error. Error detected by LLVM's libFuzzer using the -following event: - -$ perf stat -e 'msr/event/,f:e' -event syntax error: 'msr/event/,f:e' - \___ can't access trace events - -Error: No permissions to read /sys/kernel/debug/tracing/events/f/e -Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/' - -Initial error: -event syntax error: 'msr/event/,f:e' - \___ no value assigned for term -Run 'perf list' for a list of valid events - - Usage: perf stat [] [] - - -e, --event event selector. use 'perf list' to list available events - -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Andi Kleen -Cc: Jin Yao -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Stephane Eranian -Cc: clang-built-linux@googlegroups.com -Link: http://lore.kernel.org/lkml/20191120180925.21787-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/parse-events.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c -index 096c52f296d7..6a9ae16cd098 100644 ---- a/tools/perf/util/parse-events.c -+++ b/tools/perf/util/parse-events.c -@@ -451,6 +451,7 @@ int parse_events_add_cache(struct list_head *list, int *idx, - static void tracepoint_error(struct parse_events_error *e, int err, - const char *sys, const char *name) - { -+ const char *str; - char help[BUFSIZ]; - - if (!e) -@@ -464,18 +465,18 @@ static void tracepoint_error(struct parse_events_error *e, int err, - - switch (err) { - case EACCES: -- e->str = strdup("can't access trace events"); -+ str = "can't access trace events"; - break; - case ENOENT: -- e->str = strdup("unknown tracepoint"); -+ str = "unknown tracepoint"; - break; - default: -- e->str = strdup("failed to add tracepoint"); -+ str = "failed to add tracepoint"; - break; - } - - tracing_path__strerror_open_tp(err, help, sizeof(help), sys, name); -- e->help = strdup(help); -+ parse_events__handle_error(e, 0, strdup(str), strdup(help)); - } - - static int add_tracepoint(struct list_head *list, int *idx, --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 7af0af9872f..ff45ccb5d44 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -131,7 +131,6 @@ crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch mac80211-consider-qos-null-frames-for-sta_nullfunc_a.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-parse-fix-potential-memory-leak-when-handling-t.patch mips-fix-build-when-48-bits-virtual-memory-is-enable.patch perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch diff --git a/queue-4.19/perf-parse-fix-potential-memory-leak-when-handling-t.patch b/queue-4.19/perf-parse-fix-potential-memory-leak-when-handling-t.patch deleted file mode 100644 index b3b85848043..00000000000 --- a/queue-4.19/perf-parse-fix-potential-memory-leak-when-handling-t.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4739ac75114dd537ad641a7300f6d59b6efc57d1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Nov 2019 10:09:25 -0800 -Subject: perf parse: Fix potential memory leak when handling tracepoint errors - -From: Ian Rogers - -[ Upstream commit 4584f084aa9d8033d5911935837dbee7b082d0e9 ] - -An error may be in place when tracepoint_error is called, use -parse_events__handle_error to avoid a memory leak and to capture the -first and last error. Error detected by LLVM's libFuzzer using the -following event: - -$ perf stat -e 'msr/event/,f:e' -event syntax error: 'msr/event/,f:e' - \___ can't access trace events - -Error: No permissions to read /sys/kernel/debug/tracing/events/f/e -Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/' - -Initial error: -event syntax error: 'msr/event/,f:e' - \___ no value assigned for term -Run 'perf list' for a list of valid events - - Usage: perf stat [] [] - - -e, --event event selector. use 'perf list' to list available events - -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Andi Kleen -Cc: Jin Yao -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Stephane Eranian -Cc: clang-built-linux@googlegroups.com -Link: http://lore.kernel.org/lkml/20191120180925.21787-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/parse-events.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c -index 95043cae5774..6f7292442b82 100644 ---- a/tools/perf/util/parse-events.c -+++ b/tools/perf/util/parse-events.c -@@ -457,6 +457,7 @@ int parse_events_add_cache(struct list_head *list, int *idx, - static void tracepoint_error(struct parse_events_error *e, int err, - const char *sys, const char *name) - { -+ const char *str; - char help[BUFSIZ]; - - if (!e) -@@ -470,18 +471,18 @@ static void tracepoint_error(struct parse_events_error *e, int err, - - switch (err) { - case EACCES: -- e->str = strdup("can't access trace events"); -+ str = "can't access trace events"; - break; - case ENOENT: -- e->str = strdup("unknown tracepoint"); -+ str = "unknown tracepoint"; - break; - default: -- e->str = strdup("failed to add tracepoint"); -+ str = "failed to add tracepoint"; - break; - } - - tracing_path__strerror_open_tp(err, help, sizeof(help), sys, name); -- e->help = strdup(help); -+ parse_events__handle_error(e, 0, strdup(str), strdup(help)); - } - - static int add_tracepoint(struct list_head *list, int *idx, --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index bc368c28659..cf1327f304a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -182,7 +182,6 @@ crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch mac80211-consider-qos-null-frames-for-sta_nullfunc_a.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-parse-fix-potential-memory-leak-when-handling-t.patch mips-fix-build-when-48-bits-virtual-memory-is-enable.patch drm-amdgpu-fix-bad-dma-from-interrupt_cntl2.patch perf-intel-bts-does-not-support-aux-area-sampling.patch diff --git a/queue-4.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch b/queue-4.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch deleted file mode 100644 index 0d543a611f6..00000000000 --- a/queue-4.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c21827a59a7b4ca9444d6a86795519919e805c36 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Nov 2019 10:09:25 -0800 -Subject: perf parse: Fix potential memory leak when handling tracepoint errors - -From: Ian Rogers - -[ Upstream commit 4584f084aa9d8033d5911935837dbee7b082d0e9 ] - -An error may be in place when tracepoint_error is called, use -parse_events__handle_error to avoid a memory leak and to capture the -first and last error. Error detected by LLVM's libFuzzer using the -following event: - -$ perf stat -e 'msr/event/,f:e' -event syntax error: 'msr/event/,f:e' - \___ can't access trace events - -Error: No permissions to read /sys/kernel/debug/tracing/events/f/e -Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/' - -Initial error: -event syntax error: 'msr/event/,f:e' - \___ no value assigned for term -Run 'perf list' for a list of valid events - - Usage: perf stat [] [] - - -e, --event event selector. use 'perf list' to list available events - -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Andi Kleen -Cc: Jin Yao -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Stephane Eranian -Cc: clang-built-linux@googlegroups.com -Link: http://lore.kernel.org/lkml/20191120180925.21787-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/parse-events.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c -index 9351738df703..004f28a04123 100644 ---- a/tools/perf/util/parse-events.c -+++ b/tools/perf/util/parse-events.c -@@ -398,6 +398,7 @@ int parse_events_add_cache(struct list_head *list, int *idx, - static void tracepoint_error(struct parse_events_error *e, int err, - char *sys, char *name) - { -+ const char *str; - char help[BUFSIZ]; - - if (!e) -@@ -411,18 +412,18 @@ static void tracepoint_error(struct parse_events_error *e, int err, - - switch (err) { - case EACCES: -- e->str = strdup("can't access trace events"); -+ str = "can't access trace events"; - break; - case ENOENT: -- e->str = strdup("unknown tracepoint"); -+ str = "unknown tracepoint"; - break; - default: -- e->str = strdup("failed to add tracepoint"); -+ str = "failed to add tracepoint"; - break; - } - - tracing_path__strerror_open_tp(err, help, sizeof(help), sys, name); -- e->help = strdup(help); -+ parse_events__handle_error(e, 0, strdup(str), strdup(help)); - } - - static int add_tracepoint(struct list_head *list, int *idx, --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index d192b53ac02..af96557113f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -62,7 +62,6 @@ fbtft-make-sure-string-is-null-terminated.patch crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-parse-fix-potential-memory-leak-when-handling-t.patch perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch revert-mmc-sdhci-fix-incorrect-switch-to-hs-mode.patch diff --git a/queue-4.9/perf-parse-fix-potential-memory-leak-when-handling-t.patch b/queue-4.9/perf-parse-fix-potential-memory-leak-when-handling-t.patch deleted file mode 100644 index fa8a14e1e25..00000000000 --- a/queue-4.9/perf-parse-fix-potential-memory-leak-when-handling-t.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ec3e191b015144fe77fb717da3a5721defdf3c1b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Nov 2019 10:09:25 -0800 -Subject: perf parse: Fix potential memory leak when handling tracepoint errors - -From: Ian Rogers - -[ Upstream commit 4584f084aa9d8033d5911935837dbee7b082d0e9 ] - -An error may be in place when tracepoint_error is called, use -parse_events__handle_error to avoid a memory leak and to capture the -first and last error. Error detected by LLVM's libFuzzer using the -following event: - -$ perf stat -e 'msr/event/,f:e' -event syntax error: 'msr/event/,f:e' - \___ can't access trace events - -Error: No permissions to read /sys/kernel/debug/tracing/events/f/e -Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/' - -Initial error: -event syntax error: 'msr/event/,f:e' - \___ no value assigned for term -Run 'perf list' for a list of valid events - - Usage: perf stat [] [] - - -e, --event event selector. use 'perf list' to list available events - -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Andi Kleen -Cc: Jin Yao -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Stephane Eranian -Cc: clang-built-linux@googlegroups.com -Link: http://lore.kernel.org/lkml/20191120180925.21787-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/parse-events.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c -index 6193be6d7639..cfb64369a18d 100644 ---- a/tools/perf/util/parse-events.c -+++ b/tools/perf/util/parse-events.c -@@ -440,6 +440,7 @@ int parse_events_add_cache(struct list_head *list, int *idx, - static void tracepoint_error(struct parse_events_error *e, int err, - const char *sys, const char *name) - { -+ const char *str; - char help[BUFSIZ]; - - if (!e) -@@ -453,18 +454,18 @@ static void tracepoint_error(struct parse_events_error *e, int err, - - switch (err) { - case EACCES: -- e->str = strdup("can't access trace events"); -+ str = "can't access trace events"; - break; - case ENOENT: -- e->str = strdup("unknown tracepoint"); -+ str = "unknown tracepoint"; - break; - default: -- e->str = strdup("failed to add tracepoint"); -+ str = "failed to add tracepoint"; - break; - } - - tracing_path__strerror_open_tp(err, help, sizeof(help), sys, name); -- e->help = strdup(help); -+ parse_events__handle_error(e, 0, strdup(str), strdup(help)); - } - - static int add_tracepoint(struct list_head *list, int *idx, --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 01032f1098e..0e4c5946f4e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -81,7 +81,6 @@ fbtft-make-sure-string-is-null-terminated.patch crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-parse-fix-potential-memory-leak-when-handling-t.patch perf-intel-bts-does-not-support-aux-area-sampling.patch net-phy-initialise-phydev-speed-and-duplex-sanely.patch btrfs-don-t-prematurely-free-work-in-reada_start_mac.patch diff --git a/queue-5.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch b/queue-5.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch deleted file mode 100644 index 0e0544ddf48..00000000000 --- a/queue-5.4/perf-parse-fix-potential-memory-leak-when-handling-t.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 41842cd4daff38b7edf87cba15d226ff565aabd8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 20 Nov 2019 10:09:25 -0800 -Subject: perf parse: Fix potential memory leak when handling tracepoint errors - -From: Ian Rogers - -[ Upstream commit 4584f084aa9d8033d5911935837dbee7b082d0e9 ] - -An error may be in place when tracepoint_error is called, use -parse_events__handle_error to avoid a memory leak and to capture the -first and last error. Error detected by LLVM's libFuzzer using the -following event: - -$ perf stat -e 'msr/event/,f:e' -event syntax error: 'msr/event/,f:e' - \___ can't access trace events - -Error: No permissions to read /sys/kernel/debug/tracing/events/f/e -Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/' - -Initial error: -event syntax error: 'msr/event/,f:e' - \___ no value assigned for term -Run 'perf list' for a list of valid events - - Usage: perf stat [] [] - - -e, --event event selector. use 'perf list' to list available events - -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Andi Kleen -Cc: Jin Yao -Cc: Jiri Olsa -Cc: Mark Rutland -Cc: Namhyung Kim -Cc: Peter Zijlstra -Cc: Stephane Eranian -Cc: clang-built-linux@googlegroups.com -Link: http://lore.kernel.org/lkml/20191120180925.21787-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/parse-events.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c -index 422ad1888e74..9a958ec5a096 100644 ---- a/tools/perf/util/parse-events.c -+++ b/tools/perf/util/parse-events.c -@@ -480,6 +480,7 @@ int parse_events_add_cache(struct list_head *list, int *idx, - static void tracepoint_error(struct parse_events_error *e, int err, - const char *sys, const char *name) - { -+ const char *str; - char help[BUFSIZ]; - - if (!e) -@@ -493,18 +494,18 @@ static void tracepoint_error(struct parse_events_error *e, int err, - - switch (err) { - case EACCES: -- e->str = strdup("can't access trace events"); -+ str = "can't access trace events"; - break; - case ENOENT: -- e->str = strdup("unknown tracepoint"); -+ str = "unknown tracepoint"; - break; - default: -- e->str = strdup("failed to add tracepoint"); -+ str = "failed to add tracepoint"; - break; - } - - tracing_path__strerror_open_tp(err, help, sizeof(help), sys, name); -- e->help = strdup(help); -+ parse_events__handle_error(e, 0, strdup(str), strdup(help)); - } - - static int add_tracepoint(struct list_head *list, int *idx, --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index a9a0ee0cb7b..18dc4c8cec0 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -346,7 +346,6 @@ crypto-sun4i-ss-fix-64-bit-size_t-warnings-on-sun4i-.patch mac80211-consider-qos-null-frames-for-sta_nullfunc_a.patch crypto-vmx-avoid-weird-build-failures.patch libtraceevent-fix-memory-leakage-in-copy_filter_type.patch -perf-parse-fix-potential-memory-leak-when-handling-t.patch mips-fix-build-when-48-bits-virtual-memory-is-enable.patch drm-amdgpu-fix-bad-dma-from-interrupt_cntl2.patch ice-only-disable-vf-state-when-freeing-each-vf-resou.patch