]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf/core: Fix potential NULL deref
authorPeter Zijlstra <peterz@infradead.org>
Tue, 24 Oct 2023 09:42:21 +0000 (11:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Nov 2023 16:26:41 +0000 (17:26 +0100)
commit a71ef31485bb51b846e8db8b3a35e432cc15afb5 upstream.

Smatch is awesome.

Fixes: 32671e3799ca ("perf: Disallow mis-matched inherited group reads")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/events/core.c

index 1732f6548bc6cccfc86478cf0bef3041d333cacd..8e1290340aaf69a19c771ad2c29d52fa5ba96f54 100644 (file)
@@ -13277,7 +13277,8 @@ static int inherit_group(struct perf_event *parent_event,
                    !perf_get_aux_event(child_ctr, leader))
                        return -EINVAL;
        }
-       leader->group_generation = parent_event->group_generation;
+       if (leader)
+               leader->group_generation = parent_event->group_generation;
        return 0;
 }