]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
perf/core: Fix potential NULL deref
authorPeter Zijlstra <peterz@infradead.org>
Tue, 24 Oct 2023 09:42:21 +0000 (11:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 24 Oct 2023 10:15:12 +0000 (12:15 +0200)
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>
kernel/events/core.c

index d0663b9324e7a76b0ece07d74b0b4b0a7390e82b..a2f2a9525d72ea86c5510ace8ba651c504e5d794 100644 (file)
@@ -13372,7 +13372,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;
 }