mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
bpf: Allow bpf_{s,g}etsockopt from cgroup bind{4,6} hooks
I have to now lock/unlock socket for the bind hook execution. That shouldn't cause any overhead because the socket is unbound and shouldn't receive any traffic. Signed-off-by: Stanislav Fomichev <sdf@google.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Andrey Ignatov <rdna@fb.com> Link: https://lore.kernel.org/bpf/20201202172516.3483656-3-sdf@google.com
This commit is contained in:
parent
a999696c54
commit
427167c0b0
4 changed files with 12 additions and 8 deletions
|
@ -246,11 +246,11 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key,
|
||||||
__ret; \
|
__ret; \
|
||||||
})
|
})
|
||||||
|
|
||||||
#define BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr) \
|
#define BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr) \
|
||||||
BPF_CGROUP_RUN_SA_PROG(sk, uaddr, BPF_CGROUP_INET4_BIND)
|
BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET4_BIND, NULL)
|
||||||
|
|
||||||
#define BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr) \
|
#define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr) \
|
||||||
BPF_CGROUP_RUN_SA_PROG(sk, uaddr, BPF_CGROUP_INET6_BIND)
|
BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_INET6_BIND, NULL)
|
||||||
|
|
||||||
#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (cgroup_bpf_enabled && \
|
#define BPF_CGROUP_PRE_CONNECT_ENABLED(sk) (cgroup_bpf_enabled && \
|
||||||
sk->sk_prot->pre_connect)
|
sk->sk_prot->pre_connect)
|
||||||
|
@ -434,8 +434,8 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,
|
||||||
#define BPF_CGROUP_RUN_PROG_INET_EGRESS(sk,skb) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET_EGRESS(sk,skb) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET_SOCK(sk) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET_SOCK(sk) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET_SOCK_RELEASE(sk) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET_SOCK_RELEASE(sk) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET4_POST_BIND(sk) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND(sk) ({ 0; })
|
||||||
#define BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr) ({ 0; })
|
#define BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr) ({ 0; })
|
||||||
|
|
|
@ -6995,6 +6995,8 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
|
||||||
return &bpf_sk_storage_delete_proto;
|
return &bpf_sk_storage_delete_proto;
|
||||||
case BPF_FUNC_setsockopt:
|
case BPF_FUNC_setsockopt:
|
||||||
switch (prog->expected_attach_type) {
|
switch (prog->expected_attach_type) {
|
||||||
|
case BPF_CGROUP_INET4_BIND:
|
||||||
|
case BPF_CGROUP_INET6_BIND:
|
||||||
case BPF_CGROUP_INET4_CONNECT:
|
case BPF_CGROUP_INET4_CONNECT:
|
||||||
case BPF_CGROUP_INET6_CONNECT:
|
case BPF_CGROUP_INET6_CONNECT:
|
||||||
return &bpf_sock_addr_setsockopt_proto;
|
return &bpf_sock_addr_setsockopt_proto;
|
||||||
|
@ -7003,6 +7005,8 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
|
||||||
}
|
}
|
||||||
case BPF_FUNC_getsockopt:
|
case BPF_FUNC_getsockopt:
|
||||||
switch (prog->expected_attach_type) {
|
switch (prog->expected_attach_type) {
|
||||||
|
case BPF_CGROUP_INET4_BIND:
|
||||||
|
case BPF_CGROUP_INET6_BIND:
|
||||||
case BPF_CGROUP_INET4_CONNECT:
|
case BPF_CGROUP_INET4_CONNECT:
|
||||||
case BPF_CGROUP_INET6_CONNECT:
|
case BPF_CGROUP_INET6_CONNECT:
|
||||||
return &bpf_sock_addr_getsockopt_proto;
|
return &bpf_sock_addr_getsockopt_proto;
|
||||||
|
|
|
@ -450,7 +450,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||||
/* BPF prog is run before any checks are done so that if the prog
|
/* BPF prog is run before any checks are done so that if the prog
|
||||||
* changes context in a wrong way it will be caught.
|
* changes context in a wrong way it will be caught.
|
||||||
*/
|
*/
|
||||||
err = BPF_CGROUP_RUN_PROG_INET4_BIND(sk, uaddr);
|
err = BPF_CGROUP_RUN_PROG_INET4_BIND_LOCK(sk, uaddr);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
|
@ -451,7 +451,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
||||||
/* BPF prog is run before any checks are done so that if the prog
|
/* BPF prog is run before any checks are done so that if the prog
|
||||||
* changes context in a wrong way it will be caught.
|
* changes context in a wrong way it will be caught.
|
||||||
*/
|
*/
|
||||||
err = BPF_CGROUP_RUN_PROG_INET6_BIND(sk, uaddr);
|
err = BPF_CGROUP_RUN_PROG_INET6_BIND_LOCK(sk, uaddr);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue