Commit d6897d07 authored by Yang Jihong's avatar Yang Jihong
Browse files

perf: Fix kabi breakage in struct perf_event 

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: default avatarYang Jihong <yangjihong1@huawei.com>
parent f46587d8

include/linux/perf_event.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

};