projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e232f2
)
perf/core: Fix potential NULL deref
author
Peter Zijlstra
<peterz@infradead.org>
Tue, 24 Oct 2023 09:42:21 +0000
(11:42 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 2 Nov 2023 08:35:32 +0000
(09:35 +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
patch
|
blob
|
history
diff --git
a/kernel/events/core.c
b/kernel/events/core.c
index 2b8315a948a2c4208a2e696ee73c73e3d72ea3ab..8f2b9d8b9150ed6dcb106ba17ce86804508c6beb 100644
(file)
--- a/
kernel/events/core.c
+++ b/
kernel/events/core.c
@@
-13293,7
+13293,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;
}