bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
Subsystems (5)
v2 cover bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
We'd like to be able to identify netns from setsockopt hooks to be able to do the enforcement of some options only in the "initial" netns (to give users the ability to create clear/isolated sandboxes if needed without any enforcement by doing unshare(net)).
v2:
- add missing CONFIG_NET
Stanislav Fomichev (2):
bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT selftests/bpf: verify bpf_get_netns_cookie in
BPF_PROG_TYPE_CGROUP_SOCKOPT
kernel/bpf/cgroup.c | 19 ++++++++++++++++ tools/testing/selftests/bpf/verifier/ctx.c | 25 ++++++++++++++++++++++ 2 files changed, 44 insertions(+)
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
PATCH v2 1/2 bpf: Allow bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
This is similar to existing BPF_PROG_TYPE_CGROUP_SOCK and BPF_PROG_TYPE_CGROUP_SOCK_ADDR.
--- kernel/bpf/cgroup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
kernel/bpf/cgroup.c +19 -0
@@ -1846,11 +1846,30 @@ const struct bpf_verifier_ops cg_sysctl_verifier_ops = {const struct bpf_prog_ops cg_sysctl_prog_ops = { }; +#ifdef CONFIG_NET +BPF_CALL_1(bpf_get_netns_cookie_sockopt, struct bpf_sockopt_kern *, ctx) +{ +struct sock *sk = ctx ? ctx->sk :NULL ; +const struct net *net = sk ?sock_net (sk) : &init_net; + +return net->net_cookie; +} + +static const struct bpf_func_proto bpf_get_netns_cookie_sockopt_proto = { + .func = bpf_get_netns_cookie_sockopt, + .gpl_only = false, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX_OR_NULL , +}; +#endif +static const struct bpf_func_proto *cg_sockopt_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {switch (func_id) {#ifdef CONFIG_NET +case BPF_FUNC_get_netns_cookie: +return &bpf_get_netns_cookie_sockopt_proto;case BPF_FUNC_sk_storage_get:return &bpf_sk_storage_get_proto;case BPF_FUNC_sk_storage_delete:
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog
Quoted 13 lines · Stanislav Fomichev
This is similar to existing
BPF_PROG_TYPE_CGROUP_SOCKandBPF_PROG_TYPE_CGROUP_SOCK_ADDR.Signed-off-by Stanislav Fomichev <[email protected]>--- kernel/bpf/cgroup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)kernel/bpf/cgroup.c +0
-0
kernel/bpf/cgroup.c const struct bpf_verifier_ops cg_sysctl_verifier_ops = { · line 1853
Quoted 8 lines
kernel/bpf/cgroup.c +5
-0@@ -1846,11 +1846,30 @@ const struct bpf_verifier_ops cg_sysctl_verifier_ops = {const struct bpf_prog_ops cg_sysctl_prog_ops = { }; +#ifdef CONFIG_NET +BPF_CALL_1(bpf_get_netns_cookie_sockopt, struct bpf_sockopt_kern *, ctx) +{ +struct sock *sk = ctx ? ctx->sk :NULL ; +const struct net *net = sk ?sock_net (sk) : &init_net;
A nit.
ctx->sk can not be NULL here, so it only depends on ctx is NULL or not.
If I read it correctly, would it be less convoluted to directly test ctx and use ctx->sk here, like:
const struct net *net = ctx ? sock_net(ctx->sk) : &init_net;
and the previous "struct sock *sk = ctx ? ctx->sk : NULL;" statement can also be removed.
Quoted 4 lines
kernel/bpf/cgroup.c +4
-0+ +return net->net_cookie; +} +
Quoted 28 lines · Martin KaFai Lau
kernel/bpf/cgroup.c const struct bpf_verifier_ops
Quoted 13 lines · Stanislav Fomichev
This is similar to existing
BPF_PROG_TYPE_CGROUP_SOCKandBPF_PROG_TYPE_CGROUP_SOCK_ADDR.Signed-off-by Stanislav Fomichev <[email protected]>--- kernel/bpf/cgroup.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)kernel/bpf/cgroup.c +0
-0@@ -1846,11 +1846,30 @@ const struct bpf_verifier_ops
cg_sysctl_verifier_ops= {kernel/bpf/cgroup.c const struct bpf_verifier_ops cg_sysctl_verifier_ops = {
Quoted 5 lines
kernel/bpf/cgroup.c +2
-0const struct bpf_prog_ops cg_sysctl_prog_ops = { }; +#ifdef CONFIG_NET +BPF_CALL_1(bpf_get_netns_cookie_sockopt, struct bpf_sockopt_kern *,ctx)
kernel/bpf/cgroup.c const struct bpf_verifier_ops cg_sysctl_verifier_ops = { · line 1853
Quoted 3 lines
kernel/bpf/cgroup.c +3
-0+{ +struct sock *sk = ctx ? ctx->sk :NULL ; +const struct net *net = sk ?sock_net (sk) : &init_net;A nit.
ctx->skcan not be NULL here, so it only depends on ctx is NULL or not.
Quoted 7 lines
If I read it correctly, would it be less convoluted to directly test ctx and use
ctx->skhere, like:const struct net *net = ctx ? sock_net(ctx->sk) : &init_net;and the previous "struct sock *sk = ctx ?
ctx->sk: NULL;" statement can also be removed.
Agreed, makes sense. Let me also add bpf_get_netns_cookie to some existing BPF prog to make sure it's executed. That ctx.c isn't really running the prog..
PATCH v2 2/2 selftests/bpf: verify bpf_get_netns_cookie in BPF_PROG_TYPE_CGROUP_SOCKOPT
In reply to Stanislav FomichevAdd verifier ctx test to call bpf_get_netns_cookie from cgroup/setsockopt.
#269/p pass ctx or null check, 1: ctx Did not run the program (not supported) OK #270/p pass ctx or null check, 2: null Did not run the program (not supported) OK #271/p pass ctx or null check, 3: 1 OK
#272/p pass ctx or null check, 4: ctx - const OK
#273/p pass ctx or null check, 5: null (connect) Did not run the program (not supported) OK #274/p pass ctx or null check, 6: null (bind) Did not run the program (not supported) OK #275/p pass ctx or null check, 7: ctx (bind) Did not run the program (not supported) OK #276/p pass ctx or null check, 8: null (bind) OK
#277/p pass ctx or null check, 9: ctx (cgroup/setsockopt) Did not run the program (not supported) OK #278/p pass ctx or null check, 10: null (cgroup/setsockopt) Did not run the program (not supported) OK
--- tools/testing/selftests/bpf/verifier/ctx.c | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tools/testing/selftests/bpf/verifier/ctx.c +25 -0
@@ -195,3 +195,28 @@ .result = REJECT, .errstr = "R1 type=inv expected=ctx", }, +{ + "pass ctx or null check, 9: ctx (cgroup/setsockopt)", + .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_SOCKOPT , + .expected_attach_type = BPF_CGROUP_SETSOCKOPT, + .result = ACCEPT, +}, +{ +"pass ctx or null check, 10: null (cgroup/setsockopt)" , + .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_SOCKOPT , + .expected_attach_type = BPF_CGROUP_SETSOCKOPT, + .result = ACCEPT, +},
Signature · 1 line
2.33.0.rc1.237.g0d66db33f3-goog