diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2023-10-24 11:42:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-08 17:26:41 +0100 |
| commit | 21b07a2e6095ea57356527d20fe5bf2a5adbac3d (patch) | |
| tree | 4cec07aa842219847507d952f2639d07faafb5d5 /kernel | |
| parent | 6efd498009b987a92f57f3bdae476f0503364fb7 (diff) | |
perf/core: Fix potential NULL deref
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 1732f6548bc6..8e1290340aaf 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -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; } |