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 11:22:17 +0100 |
| commit | c9e02711e716a095b6e0ddf6f8b0498e340c569e (patch) | |
| tree | 9085d778ed73674b3559d734037aef7dd852b39f | |
| parent | 984ee4d4bdc5d0d8735472cfdfba3a823cfc5cf7 (diff) | |
| download | linux-stable-c9e02711e716a095b6e0ddf6f8b0498e340c569e.tar.gz linux-stable-c9e02711e716a095b6e0ddf6f8b0498e340c569e.tar.bz2 linux-stable-c9e02711e716a095b6e0ddf6f8b0498e340c569e.zip | |
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>
| -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 8f3f3cc08496..3c8eb5d84214 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -11629,7 +11629,8 @@ static int inherit_group(struct perf_event *parent_event, if (IS_ERR(child_ctr)) return PTR_ERR(child_ctr); } - leader->group_generation = parent_event->group_generation; + if (leader) + leader->group_generation = parent_event->group_generation; return 0; } |