6.2-stable patches

added patches:
	perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch

diff --git a/queue-6.2/perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch b/queue-6.2/perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch
new file mode 100644 (file)
index 0000000..9b99a34
--- /dev/null
+++ b/queue-6.2/perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch
@@ -0,0 +1,35 @@
+From fd0815f632c24878e325821943edccc7fde947a2 Mon Sep 17 00:00:00 2001
+From: Budimir Markovic <markovicbudimir@gmail.com>
+Date: Wed, 15 Mar 2023 00:29:01 -0700
+Subject: perf: Fix check before add_event_to_groups() in perf_group_detach()
+
+From: Budimir Markovic <markovicbudimir@gmail.com>
+
+commit fd0815f632c24878e325821943edccc7fde947a2 upstream.
+
+Events should only be added to a groups rb tree if they have not been
+removed from their context by list_del_event(). Since remove_on_exec
+made it possible to call list_del_event() on individual events before
+they are detached from their group, perf_group_detach() should check each
+sibling's attach_state before calling add_event_to_groups() on it.
+
+Fixes: 2e498d0a74e5 ("perf: Add support for event removal on exec")
+Signed-off-by: Budimir Markovic <markovicbudimir@gmail.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/ZBFzvQV9tEqoHEtH@gentoo
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/events/core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -2163,7 +2163,7 @@ static void perf_group_detach(struct per
+               /* Inherit group flags from the previous leader */
+               sibling->group_caps = event->group_caps;
+ 
+-              if (!RB_EMPTY_NODE(&event->group_node)) {
++              if (sibling->attach_state & PERF_ATTACH_CONTEXT) {
+                       add_event_to_groups(sibling, event->ctx);
+ 
+                       if (sibling->state == PERF_EVENT_STATE_ACTIVE)

diff --git a/queue-6.2/series b/queue-6.2/series
index e86bbae28ee5b225cb41daf6d8e34568f60bea66..2ff469650de70527ef6ce3c09185101199046984 100644 (file)
--- a/queue-6.2/series
+++ b/queue-6.2/series
@@ -209,3 +209,4 @@ virt-coco-sev-guest-carve-out-the-request-issuing-logic-into-a-helper.patch
 virt-coco-sev-guest-do-some-code-style-cleanups.patch
 virt-coco-sev-guest-convert-the-sw_exit_info_2-checking-to-a-switch-case.patch
 virt-coco-sev-guest-add-throttling-awareness.patch
+perf-fix-check-before-add_event_to_groups-in-perf_group_detach.patch