hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/14260 CVE: CVE-2026-31528 -------------------------------- Use KABI_REPLACE to fix struct perf_output_handle kabi error. Fixes: de4e807307b9 ("perf: Avoid the read if the count is already updated") Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- include/linux/perf_event.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 7d6c9e5ecf61..581117a0e67b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1065,13 +1065,14 @@ struct perf_output_handle { struct perf_buffer *rb; unsigned long wakeup; unsigned long size; - union { - u64 flags; /* perf_output*() */ - u64 aux_flags; /* perf_aux_output*() */ - struct { - u64 skip_read : 1; - }; - }; + KABI_REPLACE(u64 aux_flags, + union { + u64 flags; /* perf_output*() */ + u64 aux_flags; /* perf_aux_output*() */ + struct { + u64 skip_read : 1; + }; + }) union { void *addr; unsigned long head; -- 2.34.1