Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICTB0G CVE: CVE-2025-38502 -------------------------------- Fix kabi breakage for bpf_map by using KABI_FILL_HOLE and KABI_EXTEND. Fixes: fd1c98f0ef5c ("[Backport] bpf: Move bpf map owner out of common struct") Signed-off-by: Xiaomeng Zhang <zhangxiaomeng13@huawei.com> --- include/linux/bpf.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 5c3524de92a6..bd435b20bca1 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -207,7 +207,9 @@ struct bpf_map { bool bypass_spec_v1; bool frozen; /* write-once; write-protected by freeze_mutex */ KABI_EXTEND(bool free_after_mult_rcu_gp) - /* 17 bytes hole */ + KABI_FILL_HOLE(u64 cookie) + KABI_FILL_HOLE(spinlock_t owner_lock) + /* 4 bytes hole */ /* The 3rd and 4th cacheline with misc members to avoid false sharing * particularly with refcounting. @@ -223,9 +225,7 @@ struct bpf_map { }) struct mutex freeze_mutex; atomic64_t writecnt; - spinlock_t owner_lock; - struct bpf_map_owner *owner; - u64 cookie; /* write-once */ + KABI_EXTEND(struct bpf_map_owner *owner) }; static inline bool map_value_has_spin_lock(const struct bpf_map *map) -- 2.34.1