Drop perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch b/queue-4.14/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
deleted file mode 100644 (file)
index 77863b9..0000000
--- a/queue-4.14/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9d97d69c8f4d37eff248de93216403b167672fee Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Mar 2020 19:31:00 -0700
-Subject: perf parse-events: Fix memory leaks found on parse_events
-
-From: Ian Rogers <irogers@google.com>
-
-[ Upstream commit e8dfb81838b14f82521968343884665b996646ef ]
-
-Fix a memory leak found by applying LLVM's libfuzzer on parse_events().
-
-Signed-off-by: Ian Rogers <irogers@google.com>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Cc: Adrian Hunter <adrian.hunter@intel.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Stephane Eranian <eranian@google.com>
-Cc: clang-built-linux@googlegroups.com
-Link: http://lore.kernel.org/lkml/20200319023101.82458-1-irogers@google.com
-[ split from a larger patch, use zfree() ]
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/util/parse-events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
-index 096c52f296d77..2733cdfdf04c6 100644
---- a/tools/perf/util/parse-events.c
-+++ b/tools/perf/util/parse-events.c
-@@ -1258,6 +1258,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,
- 
-               list_for_each_entry_safe(pos, tmp, &config_terms, list) {
-                       list_del_init(&pos->list);
-+                      zfree(&pos->val.str);
-                       free(pos);
-               }
-               return -EINVAL;
--- 
-2.25.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 771fca34a82740a5a662332c653a7fa496178e2b..39f97be2c3be1c910a5d2beb666baf14bb43f003 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -109,7 +109,6 @@ sparc64-vcc-fix-error-return-code-in-vcc_probe.patch
 arm64-cpufeature-relax-checks-for-aarch32-support-at.patch
 dt-bindings-sound-wm8994-correct-required-supplies-b.patch
 atm-fix-a-memory-leak-of-vcc-user_back.patch
-perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
 power-supply-max17040-correct-voltage-reading.patch
 phy-samsung-s5pv210-usb2-add-delay-after-reset.patch
 bluetooth-handle-inquiry-cancel-error-after-inquiry-.patch

diff --git a/queue-4.19/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch b/queue-4.19/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
deleted file mode 100644 (file)
index ac5ded7..0000000
--- a/queue-4.19/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 12af937c8babb84eb214501bdc2de94daa0b54b9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Mar 2020 19:31:00 -0700
-Subject: perf parse-events: Fix memory leaks found on parse_events
-
-From: Ian Rogers <irogers@google.com>
-
-[ Upstream commit e8dfb81838b14f82521968343884665b996646ef ]
-
-Fix a memory leak found by applying LLVM's libfuzzer on parse_events().
-
-Signed-off-by: Ian Rogers <irogers@google.com>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Cc: Adrian Hunter <adrian.hunter@intel.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Stephane Eranian <eranian@google.com>
-Cc: clang-built-linux@googlegroups.com
-Link: http://lore.kernel.org/lkml/20200319023101.82458-1-irogers@google.com
-[ split from a larger patch, use zfree() ]
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/util/parse-events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
-index 6d087d9acd5ee..cce96b05d24c9 100644
---- a/tools/perf/util/parse-events.c
-+++ b/tools/perf/util/parse-events.c
-@@ -1287,6 +1287,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
- 
-               list_for_each_entry_safe(pos, tmp, &config_terms, list) {
-                       list_del_init(&pos->list);
-+                      zfree(&pos->val.str);
-                       free(pos);
-               }
-               return -EINVAL;
--- 
-2.25.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index e5c320c9214a3b33a1315d70fcd41ec35a7c2779..926b526a1dfc48d8f87d8066941e512021186380 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -154,7 +154,6 @@ sparc64-vcc-fix-error-return-code-in-vcc_probe.patch
 arm64-cpufeature-relax-checks-for-aarch32-support-at.patch
 dt-bindings-sound-wm8994-correct-required-supplies-b.patch
 atm-fix-a-memory-leak-of-vcc-user_back.patch
-perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
 perf-mem2node-avoid-double-free-related-to-realloc.patch
 power-supply-max17040-correct-voltage-reading.patch
 phy-samsung-s5pv210-usb2-add-delay-after-reset.patch

diff --git a/queue-5.4/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch b/queue-5.4/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
deleted file mode 100644 (file)
index 7400898..0000000
--- a/queue-5.4/perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 070cae21fc6343b2c9d67f7d790a7854408f677e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 18 Mar 2020 19:31:00 -0700
-Subject: perf parse-events: Fix memory leaks found on parse_events
-
-From: Ian Rogers <irogers@google.com>
-
-[ Upstream commit e8dfb81838b14f82521968343884665b996646ef ]
-
-Fix a memory leak found by applying LLVM's libfuzzer on parse_events().
-
-Signed-off-by: Ian Rogers <irogers@google.com>
-Acked-by: Jiri Olsa <jolsa@redhat.com>
-Cc: Adrian Hunter <adrian.hunter@intel.com>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Andi Kleen <ak@linux.intel.com>
-Cc: Leo Yan <leo.yan@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Stephane Eranian <eranian@google.com>
-Cc: clang-built-linux@googlegroups.com
-Link: http://lore.kernel.org/lkml/20200319023101.82458-1-irogers@google.com
-[ split from a larger patch, use zfree() ]
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/perf/util/parse-events.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
-index e232dfe07f8fb..f3b10b8449010 100644
---- a/tools/perf/util/parse-events.c
-+++ b/tools/perf/util/parse-events.c
-@@ -1370,6 +1370,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,
- 
-               list_for_each_entry_safe(pos, tmp, &config_terms, list) {
-                       list_del_init(&pos->list);
-+                      zfree(&pos->val.str);
-                       free(pos);
-               }
-               return -EINVAL;
--- 
-2.25.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index b5f9ad81640957e3a5a62b7017dcccfb0e87d4db..9866272086020f3609f587da8777080d09c80b84 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -246,7 +246,6 @@ dt-bindings-sound-wm8994-correct-required-supplies-b.patch
 devlink-fix-reporter-s-recovery-condition.patch
 atm-fix-a-memory-leak-of-vcc-user_back.patch
 media-venus-vdec-init-registered-list-unconditionall.patch
-perf-parse-events-fix-memory-leaks-found-on-parse_ev.patch
 perf-mem2node-avoid-double-free-related-to-realloc.patch
 mm-slub-fix-incorrect-interpretation-of-s-offset.patch
 i2c-tegra-restore-pinmux-on-system-resume.patch