Commit cee27f61 authored by Li Huafei's avatar Li Huafei
Browse files

perf: Fix kabi broken of struct perf_event 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALEPL


CVE: CVE-2024-43869

--------------------------------

Because the rcuwait structure is just a wrapper for an rcu pointer, we
can use only one kabi reservation to fix kabi issues.

Fixes: 104e258a0040 ("perf: Fix event leak upon exec and file release")
Signed-off-by: default avatarLi Huafei <lihuafei1@huawei.com>
parent 26dd116c

include/linux/perf_event.h

+1 −2
Original line number Diff line number Diff line
@@ -797,7 +797,6 @@ struct perf_event { 
	struct irq_work			pending_irq;

	struct callback_head		pending_task;

	unsigned int			pending_work;

	struct rcuwait			pending_work_wait;



	atomic_t			event_limit;
@@ -852,7 +851,7 @@ struct perf_event { 
	 */

	__u32				orig_type;



	KABI_RESERVE(1)

	KABI_USE(1, struct rcuwait pending_work_wait)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)