Commit c3e09d62 authored by Tengda Wu's avatar Tengda Wu
Browse files

bpf: Fix kabi breakage in struct bpf_insn_access_aux 

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


CVE: CVE-2024-47703

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

After backport commit f7d4945550ef ("bpf, lsm: Add check for BPF LSM
return value"), `is_retval` field was added to the struct
`bpf_insn_access_aux`, resulting in a kabi breakage.

Fix this breakage by KABI_FILL_HOLE.

Fixes: f7d4945550ef ("bpf, lsm: Add check for BPF LSM return value")
Signed-off-by: default avatarTengda Wu <wutengda2@huawei.com>
parent 145fa884

include/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static_assert(__BPF_REG_TYPE_MAX <= BPF_BASE_TYPE_LIMIT); 
 */

struct bpf_insn_access_aux {

	enum bpf_reg_type reg_type;

	bool is_retval; /* is accessing function return value ? */

	KABI_FILL_HOLE(bool is_retval) /* is accessing function return value ? */

	union {

		int ctx_field_size;

		struct {