hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYPJF CVE: CVE-2024-47703
--------------------------------
After backport commit b7105bb87cfd ("bpf: enforce exact retval range on subprog/callback exit"), struct `tnum` was replaced to struct `bpf_retval_range`, which reduced 8 bytes and result in a kabi breakage.
Fix this breakage by KABI_REPLACE.
Fixes: b7105bb87cfd ("bpf: enforce exact retval range on subprog/callback exit") Signed-off-by: Tengda Wu wutengda2@huawei.com --- include/linux/bpf_verifier.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index fcea91630903..96eab612745c 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -314,7 +314,8 @@ struct bpf_func_state { */ u32 async_entry_cnt; bool in_callback_fn; - struct bpf_retval_range callback_ret_range; + KABI_REPLACE(struct tnum callback_ret_range, + struct bpf_retval_range callback_ret_range) bool in_async_callback_fn; /* For callback calling functions that limit number of possible * callback executions (e.g. bpf_loop) keeps track of current