2019-01-25 23:24:43 +00:00
|
|
|
{
|
|
|
|
"context stores via ST",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_ST_MEM(BPF_DW, BPF_REG_1, offsetof(struct __sk_buff, mark), 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.errstr = "BPF_ST stores into R1 ctx is not allowed",
|
|
|
|
.result = REJECT,
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
},
|
|
|
|
{
|
2021-01-14 18:17:44 +00:00
|
|
|
"context stores via BPF_ATOMIC",
|
2019-01-25 23:24:43 +00:00
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
2021-01-14 18:17:44 +00:00
|
|
|
BPF_ATOMIC_OP(BPF_W, BPF_ADD, BPF_REG_1, BPF_REG_0, offsetof(struct __sk_buff, mark)),
|
2019-01-25 23:24:43 +00:00
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
2021-01-14 18:17:44 +00:00
|
|
|
.errstr = "BPF_ATOMIC stores into R1 ctx is not allowed",
|
2019-01-25 23:24:43 +00:00
|
|
|
.result = REJECT,
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
},
|
2019-01-25 23:24:44 +00:00
|
|
|
{
|
|
|
|
"arithmetic ops make PTR_TO_CTX unusable",
|
|
|
|
.insns = {
|
|
|
|
BPF_ALU64_IMM(BPF_ADD, BPF_REG_1,
|
|
|
|
offsetof(struct __sk_buff, data) -
|
|
|
|
offsetof(struct __sk_buff, mark)),
|
|
|
|
BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_REG_1,
|
|
|
|
offsetof(struct __sk_buff, mark)),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.errstr = "dereference of modified ctx ptr",
|
|
|
|
.result = REJECT,
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass unmodified ctx pointer to helper",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_2, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_csum_update),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass modified ctx pointer to helper, 1",
|
|
|
|
.insns = {
|
|
|
|
BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -612),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_2, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_csum_update),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr = "dereference of modified ctx ptr",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass modified ctx pointer to helper, 2",
|
|
|
|
.insns = {
|
|
|
|
BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -612),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_socket_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.result_unpriv = REJECT,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr_unpriv = "dereference of modified ctx ptr",
|
|
|
|
.errstr = "dereference of modified ctx ptr",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass modified ctx pointer to helper, 3",
|
|
|
|
.insns = {
|
|
|
|
BPF_LDX_MEM(BPF_W, BPF_REG_3, BPF_REG_1, 0),
|
|
|
|
BPF_ALU64_IMM(BPF_AND, BPF_REG_3, 4),
|
|
|
|
BPF_ALU64_REG(BPF_ADD, BPF_REG_1, BPF_REG_3),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_2, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_csum_update),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_SCHED_CLS,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr = "variable ctx access var_off=(0x0; 0x4)",
|
|
|
|
},
|
bpf: Add selftest cases for ctx_or_null argument type
Add various tests to make sure the verifier keeps catching them:
# ./test_verifier
[...]
#230/p pass ctx or null check, 1: ctx OK
#231/p pass ctx or null check, 2: null OK
#232/p pass ctx or null check, 3: 1 OK
#233/p pass ctx or null check, 4: ctx - const OK
#234/p pass ctx or null check, 5: null (connect) OK
#235/p pass ctx or null check, 6: null (bind) OK
#236/p pass ctx or null check, 7: ctx (bind) OK
#237/p pass ctx or null check, 8: null (bind) OK
[...]
Summary: 1595 PASSED, 0 SKIPPED, 0 FAILED
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/c74758d07b1b678036465ef7f068a49e9efd3548.1585323121.git.daniel@iogearbox.net
2020-03-27 15:58:56 +00:00
|
|
|
{
|
|
|
|
"pass ctx or null check, 1: ctx",
|
|
|
|
.insns = {
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
|
|
|
|
.expected_attach_type = BPF_CGROUP_UDP6_SENDMSG,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 2: null",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_1, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
|
|
|
|
.expected_attach_type = BPF_CGROUP_UDP6_SENDMSG,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 3: 1",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_1, 1),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
|
|
|
|
.expected_attach_type = BPF_CGROUP_UDP6_SENDMSG,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr = "R1 type=inv expected=ctx",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 4: ctx - const",
|
|
|
|
.insns = {
|
|
|
|
BPF_ALU64_IMM(BPF_ADD, BPF_REG_1, -612),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
|
|
|
|
.expected_attach_type = BPF_CGROUP_UDP6_SENDMSG,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr = "dereference of modified ctx ptr",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 5: null (connect)",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_1, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
|
|
|
|
.expected_attach_type = BPF_CGROUP_INET4_CONNECT,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 6: null (bind)",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_1, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_netns_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
|
|
|
|
.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 7: ctx (bind)",
|
|
|
|
.insns = {
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_socket_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
|
|
|
|
.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,
|
|
|
|
.result = ACCEPT,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"pass ctx or null check, 8: null (bind)",
|
|
|
|
.insns = {
|
|
|
|
BPF_MOV64_IMM(BPF_REG_1, 0),
|
|
|
|
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
|
|
|
|
BPF_FUNC_get_socket_cookie),
|
|
|
|
BPF_MOV64_IMM(BPF_REG_0, 0),
|
|
|
|
BPF_EXIT_INSN(),
|
|
|
|
},
|
|
|
|
.prog_type = BPF_PROG_TYPE_CGROUP_SOCK,
|
|
|
|
.expected_attach_type = BPF_CGROUP_INET4_POST_BIND,
|
|
|
|
.result = REJECT,
|
|
|
|
.errstr = "R1 type=inv expected=ctx",
|
|
|
|
},
|