selftests/bpf: Add reproducer for decl_tag in func_proto argument
Subsystems (3)
PATCH 1/2 selftests/bpf: Add reproducer for decl_tag in func_proto argument
It should trigger a WARN_ON_ONCE in btf_type_id_size.
RIP: 0010:btf_type_id_size+0x8bd/0x940 kernel/bpf/btf.c:1952
btf_func_proto_check kernel/bpf/btf.c:4506 [inline]
btf_check_all_types kernel/bpf/btf.c:4734 [inline]
btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763
btf_parse kernel/bpf/btf.c:5042 [inline]
btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709
bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342
__sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034
__do_sys_bpf kernel/bpf/syscall.c:5093 [inline]
__se_sys_bpf kernel/bpf/syscall.c:5091 [inline]
__x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091
do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48--- tools/testing/selftests/bpf/prog_tests/btf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/testing/selftests/bpf/prog_tests/btf.c +14 -0
@@ -3948,6 +3948,20 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid return type", }, +{ + .descr = "decl_tag test #17, func proto, argument", + .raw_types = { +BTF_TYPE_ENC (NAME_TBD ,BTF_INFO_ENC (BTF_KIND_DECL_TAG ,0 ,0 ),4 ), (-1 ),/* [1] */ +BTF_TYPE_ENC (0 ,BTF_INFO_ENC (BTF_KIND_PTR ,0 ,0 ),0 ),/* [2] */ +BTF_FUNC_PROTO_ENC (0 ,1 ),/* [3] */ +BTF_FUNC_PROTO_ARG_ENC (NAME_TBD ,1 ), +BTF_VAR_ENC (NAME_TBD ,2 ,0 ),/* [4] */ +BTF_END_RAW , + }, +BTF_STR_SEC ("\0local\0tag1\0var" ), + .btf_load_err = true, + .err_str = "Invalid arg#1", +}, { .descr ="type_tag test #1" , .raw_types = {
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
PATCH 2/2 bpf: prevent decl_tag from being referenced in func_proto arg
Syzkaller managed to hit anoher decl_tag issue:
btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48
This seems similar to commit ea68376c8bed ("bpf: prevent decl_tag from being referenced in func_proto") but for the argument.
--- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/bpf/btf.c +5 -0
@@ -4792,6 +4792,11 @@ static int btf_func_proto_check(struct btf_verifier_env *env,break ; } +if (btf_type_is_resolve_source_only (arg_type)) { +btf_verifier_log_type (env, t,"Invalid arg#%u" , i +1 ); +return -EINVAL ; + } +if (args[i].name_off && (!btf_name_offset_valid (btf, args[i].name_off) || !btf_name_valid_identifier (btf, args[i].name_off))) {
Signature · 1 line
2.38.1.584.g0f3c55d4c2-goog
Re: [PATCH bpf-next 2/2] bpf: prevent decl_tag from being referenced in func_proto arg
Quoted 14 lines · Stanislav Fomichev
Syzkaller managed to hit anoher
decl_tagissue:btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48
Quoted 5 lines
This seems similar to commit
ea68376c8bed("bpf: preventdecl_tagfrom being referenced infunc_proto") but for the argument.Reported-by [email protected]Signed-off-by Stanislav Fomichev <[email protected]>
Quoted 20 lines
--- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+)kernel/bpf/btf.c +5
-0@@ -4792,6 +4792,11 @@ static int btf_func_proto_check(struct btf_verifier_env *env,break ; } +if (btf_type_is_resolve_source_only (arg_type)) { +btf_verifier_log_type (env, t,"Invalid arg#%u" , i +1 ); +return -EINVAL ; + } +if (args[i].name_off && (!btf_name_offset_valid (btf, args[i].name_off) || !btf_name_valid_identifier (btf, args[i].name_off))) {
Daniel Borkmann
maintainerRe: [PATCH bpf-next 2/2] bpf: prevent decl_tag from being referenced in func_proto arg
In reply to Stanislav FomichevQuoted 28 lines · Stanislav Fomichev
Syzkaller managed to hit anoher
decl_tagissue:btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48This seems similar to commit
ea68376c8bed("bpf: preventdecl_tagfrom being referenced infunc_proto") but for the argument.Reported-by [email protected]Signed-off-by Stanislav Fomichev <[email protected]>--- kernel/bpf/btf.c | 5 +++++ 1 file changed, 5 insertions(+)kernel/bpf/btf.c +0
-0
kernel/bpf/btf.c static int btf_func_proto_check(struct btf_verifier_env *env, · line 4799
Quoted 8 lines
kernel/bpf/btf.c +5
-0@@ -4792,6 +4792,11 @@ static int btf_func_proto_check(struct btf_verifier_env *env,break ; } +if (btf_type_is_resolve_source_only (arg_type)) { +btf_verifier_log_type (env, t,"Invalid arg#%u" , i +1 ); +return -EINVAL ; + } +
Applied, could you do a small follow-up cleanup: most of the error cases in the loop in btf_func_proto_check() bail out with err = -EINVAL + break and the above now deviates from that, but rightfully so given there's no good reason as we just return err anyway. Would be good to make this consistent with return -EINVAL / return err also for the other cases.
kernel/bpf/btf.c static int btf_func_proto_check(struct btf_verifier_env *env, · line 4802
Quoted 4 lines
kernel/bpf/btf.c +0
-0if (args[i].name_off && (!btf_name_offset_valid (btf, args[i].name_off) || !btf_name_valid_identifier (btf, args[i].name_off))) {
Thanks,
Daniel
Quoted 15 lines · Stanislav Fomichev
It should trigger a
WARN_ON_ONCEinbtf_type_id_size.RIP: 0010:btf_type_id_size+0x8bd/0x940 kernel/bpf/btf.c:1952 btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48
Quoted 1 line
Signed-off-by Stanislav Fomichev <[email protected]>
Quoted 29 lines
--- tools/testing/selftests/bpf/prog_tests/btf.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)tools/testing/selftests/bpf/prog_tests/btf.c +14
-0@@ -3948,6 +3948,20 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid return type", }, +{ + .descr = "decl_tag test #17, func proto, argument", + .raw_types = { +BTF_TYPE_ENC (NAME_TBD ,BTF_INFO_ENC (BTF_KIND_DECL_TAG ,0 ,0 ),4 ), (-1 ),/* [1] */ +BTF_TYPE_ENC (0 ,BTF_INFO_ENC (BTF_KIND_PTR ,0 ,0 ),0 ),/* [2] */ +BTF_FUNC_PROTO_ENC (0 ,1 ),/* [3] */ +BTF_FUNC_PROTO_ARG_ENC (NAME_TBD ,1 ), +BTF_VAR_ENC (NAME_TBD ,2 ,0 ),/* [4] */ +BTF_END_RAW , + }, +BTF_STR_SEC ("\0local\0tag1\0var" ), + .btf_load_err = true, + .err_str = "Invalid arg#1", +}, { .descr ="type_tag test #1" , .raw_types = {
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 15 lines · On Tue, 22 Nov 2022 19:54:21 -0800 you wrote:
It should trigger a
WARN_ON_ONCEinbtf_type_id_size.RIP: 0010:btf_type_id_size+0x8bd/0x940 kernel/bpf/btf.c:1952 btf_func_proto_check kernel/bpf/btf.c:4506 [inline] btf_check_all_types kernel/bpf/btf.c:4734 [inline] btf_parse_type_sec+0x1175/0x1980 kernel/bpf/btf.c:4763 btf_parse kernel/bpf/btf.c:5042 [inline] btf_new_fd+0x65a/0xb00 kernel/bpf/btf.c:6709 bpf_btf_load+0x6f/0x90 kernel/bpf/syscall.c:4342 __sys_bpf+0x50a/0x6c0 kernel/bpf/syscall.c:5034 __do_sys_bpf kernel/bpf/syscall.c:5093 [inline] __se_sys_bpf kernel/bpf/syscall.c:5091 [inline] __x64_sys_bpf+0x7c/0x90 kernel/bpf/syscall.c:5091 do_syscall_64+0x54/0x70 arch/x86/entry/common.c:48
Quoted 1 line
[...]
Here is the summary with links:
- [bpf-next,1/2] selftests/bpf: Add reproducer for decl_tag in func_proto argument
https://git.kernel.org/bpf/bpf-next/c/8e898aaa733e - [bpf-next,2/2] bpf: prevent decl_tag from being referenced in func_proto arg https://git.kernel.org/bpf/bpf-next/c/f17472d45996
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html