hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8B1X3 CVE: CVE-2023-5717 -------------------------------- Fix kabi breakage in commit 0411aeb986fe ("[Backport] perf: Disallow mis-matched inherited group reads") Signed-off-by: Yang Jihong <yangjihong1@huawei.com> --- include/linux/perf_event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 4cd9a6fcbf37..8e0e8cd6d4bf 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -667,7 +667,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; @@ -788,6 +787,8 @@ struct perf_event { void *security; #endif struct list_head sb_list; + + KABI_EXTEND(unsigned int group_generation) #endif /* CONFIG_PERF_EVENTS */ }; -- 2.34.1