Skip to content

Commit 5a61cf0

Browse files
perf: Fix kABI breakage in struct perf_event
jira VULN-6760 cve CVE-2023-5717 commit-author Shreeya Patel <spatel@ciq.com> Fix kabi breakage in commit 32671e3 ("[Backport] perf: Disallow mis-matched inherited group reads") Fixes: 32671e3 ("perf: Disallow mis-matched inherited group reads") Signed-off-by: Shreeya Patel <spatel@ciq.com>
1 parent 0622cb8 commit 5a61cf0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

include/linux/perf_event.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ struct perf_guest_info_callbacks {
6161
#include <linux/security.h>
6262
#include <linux/static_call.h>
6363
#include <linux/lockdep.h>
64+
#include <linux/rh_kabi.h>
6465
#include <asm/local.h>
6566

6667
struct perf_callchain_entry {
@@ -691,7 +692,7 @@ struct perf_event {
691692
/* The cumulative AND of all event_caps for events in this group. */
692693
int group_caps;
693694

694-
unsigned int group_generation;
695+
RH_KABI_EXTEND(unsigned int group_generation)
695696
struct perf_event *group_leader;
696697
struct pmu *pmu;
697698
void *pmu_private;

0 commit comments

Comments
 (0)