hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8B1X3 CVE: CVE-2023-5717
--------------------------------
Fix kabi breakage in commit 7a304cf57d4c ("[Backport] perf: Disallow mis-matched inherited group reads")
Signed-off-by: Yang Jihong yangjihong1@huawei.com --- include/linux/perf_event.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index a4bee4a4ae13..7b755e83f17b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -622,7 +622,6 @@ struct perf_event { /* The cumulative AND of all event_caps for events in this group. */ int group_caps;
- unsigned int group_generation; struct perf_event *group_leader; struct pmu *pmu; void *pmu_private; @@ -735,6 +734,10 @@ struct perf_event { #endif
struct list_head sb_list; + +#ifndef __GENKSYMS__ + unsigned int group_generation; +#endif #endif /* CONFIG_PERF_EVENTS */ };