Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpf: Enable bpf_skc_to_* sock casting helper to networking prog type #110

Closed
wants to merge 14 commits into from
Closed

bpf: Enable bpf_skc_to_* sock casting helper to networking prog type #110

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7e03743
adding ci files
kernel-patches-bot Sep 25, 2020
43b99b9
bpf: Move the PTR_TO_BTF_ID check to check_reg_type()
iamkafai Sep 25, 2020
29b5ec6
bpf: Enable bpf_skc_to_* sock casting helper to networking prog type
iamkafai Sep 25, 2020
df8b489
bpf: Change bpf_sk_release and bpf_sk_*cgroup_id to accept ARG_PTR_TO…
iamkafai Sep 25, 2020
68fd0c3
bpf: Change bpf_sk_storage_*() to accept ARG_PTR_TO_BTF_ID_SOCK_COMMON
iamkafai Sep 25, 2020
9c9d1ae
bpf: Change bpf_tcp_*_syncookie to accept ARG_PTR_TO_BTF_ID_SOCK_COMMON
iamkafai Sep 25, 2020
a3a2d55
bpf: Change bpf_sk_assign to accept ARG_PTR_TO_BTF_ID_SOCK_COMMON
iamkafai Sep 25, 2020
c9378b0
bpf: selftest: Add ref_tracking verifier test for bpf_skc casting
iamkafai Sep 25, 2020
6cf0bc6
bpf: selftest: Move sock_fields test into test_progs
iamkafai Sep 25, 2020
9924b82
bpf: selftest: Adapt sock_fields test to use skel and global variables
iamkafai Sep 25, 2020
72409e6
bpf: selftest: Use network_helpers in the sock_fields test
iamkafai Sep 25, 2020
1676417
bpf: selftest: Use bpf_skc_to_tcp_sock() in the sock_fields test
iamkafai Sep 25, 2020
1bd1781
bpf: selftest: Remove enum tcp_ca_state from bpf_tcp_helpers.h
iamkafai Sep 25, 2020
ad04a42
bpf: selftest: Add test_btf_skc_cls_ingress
iamkafai Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bpf: selftest: Add ref_tracking verifier test for bpf_skc casting 
The patch tests for:
1. bpf_sk_release() can be called on a tcp_sock btf_id ptr.

2. Ensure the tcp_sock btf_id pointer cannot be used
   after bpf_sk_release().

Signed-off-by: Martin KaFai Lau <kafai@fb.com>
  • Loading branch information
@iamkafai @kernel-patches-bot
iamkafai authored and kernel-patches-bot committed Sep 25, 2020
commit c9378b07a5f3113efdf585c6c9ef402c769733c6
47 changes: 47 additions & 0 deletions tools/testing/selftests/bpf/verifier/ref_tracking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,3 +854,50 @@
.errstr = "Unreleased reference",
.result = REJECT,
},
{
"reference tracking: bpf_sk_release(btf_tcp_sock)",
.insns = {
BPF_SK_LOOKUP(sk_lookup_tcp),
BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
BPF_EXIT_INSN(),
BPF_MOV64_REG(BPF_REG_6, BPF_REG_0),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
BPF_EMIT_CALL(BPF_FUNC_skc_to_tcp_sock),
BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 3),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
BPF_EMIT_CALL(BPF_FUNC_sk_release),
BPF_EXIT_INSN(),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
BPF_EMIT_CALL(BPF_FUNC_sk_release),
BPF_EXIT_INSN(),
},
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = ACCEPT,
.result_unpriv = REJECT,
.errstr_unpriv = "unknown func",
},
{
"reference tracking: use ptr from bpf_skc_to_tcp_sock() after release",
.insns = {
BPF_SK_LOOKUP(sk_lookup_tcp),
BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 1),
BPF_EXIT_INSN(),
BPF_MOV64_REG(BPF_REG_6, BPF_REG_0),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
BPF_EMIT_CALL(BPF_FUNC_skc_to_tcp_sock),
BPF_JMP_IMM(BPF_JNE, BPF_REG_0, 0, 3),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
BPF_EMIT_CALL(BPF_FUNC_sk_release),
BPF_EXIT_INSN(),
BPF_MOV64_REG(BPF_REG_7, BPF_REG_0),
BPF_MOV64_REG(BPF_REG_1, BPF_REG_6),
BPF_EMIT_CALL(BPF_FUNC_sk_release),
BPF_LDX_MEM(BPF_B, BPF_REG_0, BPF_REG_7, 0),
BPF_EXIT_INSN(),
},
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
.result = REJECT,
.errstr = "invalid mem access",
.result_unpriv = REJECT,
.errstr_unpriv = "unknown func",
},