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: Li Huafei lihuafei1@huawei.com --- include/linux/perf_event.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 618a729c9f9c..2896bc5332fb 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -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)