Add cgroup sockaddr hooks for unix sockets
Subsystems (13)
v9 cover Add cgroup sockaddr hooks for unix sockets
Changes since v8:
* Added missing test programs to last patch
Changes since v7:
* Fixed formatting nit in comment
* Renamed from cgroup/connectun to cgroup/connect_unix (and similar for all other hooks)
Changes since v6:
* Actually removed bpf_bind() helper for AF_UNIX hooks.
* Fixed merge conflict
* Updated comment to mention uaddrlen is read-only for AF_INET[6]
* Removed unnecessary forward declaration of struct sock_addr_test
* Removed unused BPF_CGROUP_RUN_PROG_UNIX_CONNECT()
* Fixed formatting nit reported by checkpatch
* Added more information to commit message about recvmsg() on connected socket
Changes since v5:
* Fixed kernel version in bpftool documentation (6.3 => 6.7).
* Added connection mode socket recvmsg() test.
* Removed bpf_bind() helper for AF_UNIX hooks.
* Added missing getpeernameun and getsocknameun BPF test programs.
* Added note for bind() test being unused currently.
Changes since v4:
* Dropped support for intercepting bind() as when using bind() with unix sockets and a pathname sockaddr, bind() will create an inode in the filesystem that needs to be cleaned up. If the address is rewritten, users might try to clean up the wrong file and leak the actual socket file in the filesystem.
* Changed bpf_sock_addr_set_unix_addr() to use BTF_KFUNC_HOOK_CGROUP_SKB instead of BTF_KFUNC_HOOK_COMMON.
* Removed unix socket related changes from BPF_CGROUP_PRE_CONNECT_ENABLED() as unix sockets do not support pre-connect.
* Added tests for getpeernameun and getsocknameun hooks.
* We now disallow an empty sockaddr in bpf_sock_addr_set_unix_addr() similar to unix_validate_addr().
* Removed unnecessary cgroup_bpf_enabled() checks
* Removed unnecessary error checks
Changes since v3:
* Renamed bpf_sock_addr_set_addr() to bpf_sock_addr_set_unix_addr() and made it only operate on AF_UNIX sockaddrs. This is because for the other families, users usually want to configure more than just the address so a generic interface will not fit the bill here. e.g. for AF_INET and AF_INET6, users would generally also want to be able to configure the port which the current interface doesn't support. So we expose an AF_UNIX specific function instead.
* Made the tests in the new sock addr tests more generic (similar to test_sock_addr.c), this should make it easier to migrate the other sock addr tests in the future.
* Removed the new kfunc hook and attached to BTF_KFUNC_HOOK_COMMON instead
* Set uaddrlen to 0 when the family is AF_UNSPEC
* Pass in the addrlen to the hook from IPv6 code
* Fixed mount directory mkdir() to ignore EEXIST
Changes since v2:
* Configuring the sock addr is now done via a new kfunc bpf_sock_addr_set()
* The addrlen is exposed as u32 in bpf_sock_addr_kern
* Selftests are updated to use the new kfunc
* Selftests are now added as a new sock_addr test in prog_tests/
* Added BTF_KFUNC_HOOK_SOCK_ADDR for BPF_PROG_TYPE_CGROUP_SOCK_ADDR
* __cgroup_bpf_run_filter_sock_addr() now returns the modified addrlen
Changes since v1:
* Split into multiple patches instead of one single patch
* Added unix support for all socket address hooks instead of only connect()
* Switched approach to expose the socket address length to the bpf hook instead of recalculating the socket address length in kernelspace to properly support abstract unix socket addresses
* Modified socket address hook tests to calculate the socket address length once and pass it around everywhere instead of recalculating the actual unix socket address length on demand.
* Added some missing section name tests for getpeername()/getsockname()
This patch series extends the cgroup sockaddr hooks to include support for unix sockets. To add support for unix sockets, struct bpf_sock_addr_kern is extended to expose the socket address length to the bpf program. Along with that, a new kfunc bpf_sock_addr_set_unix_addr() is added to safely allow modifying an AF_UNIX sockaddr from bpf programs.
I intend to use these new hooks in systemd to reimplement the LogNamespace= feature, which allows running multiple instances of systemd-journald to process the logs of different services. systemd-journald also processes syslog messages, so currently, using log namespaces means all services running in the same log namespace have to live in the same private mount namespace so that systemd can mount the journal namespace's associated syslog socket over /dev/log to properly direct syslog messages from all services running in that log namespace to the correct systemd-journald instance. We want to relax this requirement so that processes running in disjoint mount namespaces can still run in the same log namespace. To achieve this, we can use these new hooks to rewrite the socket address of any connect(), sendto(), ... syscalls to /dev/log to the socket address of the journal namespace's syslog socket instead, which will transparently do the redirection without requiring use of a mount namespace and mounting over /dev/log.
Aside from the above usecase, these hooks can more generally be used to transparently redirect unix sockets to different addresses as required by services.
Daan De Meyer (9):
selftests/bpf: Add missing section name tests for
getpeername/getsockname
bpf: Propagate modified uaddrlen from cgroup sockaddr programs
bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr
from bpf
bpf: Implement cgroup sockaddr hooks for unix sockets
libbpf: Add support for cgroup unix socket address hooks
bpftool: Add support for cgroup unix socket address hooks documentation/bpf: Document cgroup unix socket address hooks selftests/bpf: Make sure mount directory exists selftests/bpf: Add tests for cgroup unix socket address hooks
Documentation/bpf/libbpf/program_types.rst | 10 + include/linux/bpf-cgroup-defs.h | 5 + include/linux/bpf-cgroup.h | 90 +-- include/linux/filter.h | 1 + include/uapi/linux/bpf.h | 13 +- kernel/bpf/btf.c | 1 + kernel/bpf/cgroup.c | 31 +- kernel/bpf/syscall.c | 15 + kernel/bpf/verifier.c | 5 +- net/core/filter.c | 48 +- net/ipv4/af_inet.c | 7 +- net/ipv4/ping.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 9 +- net/ipv6/af_inet6.c | 9 +- net/ipv6/ping.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 6 +- net/unix/af_unix.c | 36 +- .../bpftool/Documentation/bpftool-cgroup.rst | 16 +- .../bpftool/Documentation/bpftool-prog.rst | 8 +- tools/bpf/bpftool/bash-completion/bpftool | 14 +- tools/bpf/bpftool/cgroup.c | 16 +- tools/bpf/bpftool/prog.c | 7 +- tools/include/uapi/linux/bpf.h | 13 +- tools/lib/bpf/libbpf.c | 10 + tools/testing/selftests/bpf/bpf_kfuncs.h | 14 + tools/testing/selftests/bpf/cgroup_helpers.c | 5 + tools/testing/selftests/bpf/network_helpers.c | 34 + tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/section_names.c | 45 ++ .../selftests/bpf/prog_tests/sock_addr.c | 612 ++++++++++++++++++ .../selftests/bpf/progs/connect_unix_prog.c | 40 ++ .../bpf/progs/getpeername_unix_prog.c | 39 ++ .../bpf/progs/getsockname_unix_prog.c | 39 ++ .../selftests/bpf/progs/recvmsg_unix_prog.c | 39 ++ .../selftests/bpf/progs/sendmsg_unix_prog.c | 40 ++ 37 files changed, 1193 insertions(+), 93 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_addr.c create mode 100644 tools/testing/selftests/bpf/progs/connect_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getpeername_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
--
2.41.0
PATCH v9 1/9 selftests/bpf: Add missing section name tests for getpeername/getsockname
These were missed when these hooks were first added so add them now instead to make sure every sockaddr hook has a matching section name test.
--- .../selftests/bpf/prog_tests/section_names.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/testing/selftests/bpf/prog_tests/section_names.c +20 -0
@@ -158,6 +158,26 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCKOPT, BPF_CGROUP_SETSOCKOPT}, {0, BPF_CGROUP_SETSOCKOPT}, }, + { +"cgroup/getpeername4" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET4_GETPEERNAME}, + {0, BPF_CGROUP_INET4_GETPEERNAME}, + }, + { +"cgroup/getpeername6" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_GETPEERNAME}, + {0, BPF_CGROUP_INET6_GETPEERNAME}, + }, + { +"cgroup/getsockname4" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET4_GETSOCKNAME}, + {0, BPF_CGROUP_INET4_GETSOCKNAME}, + }, + { +"cgroup/getsockname6" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_GETSOCKNAME}, + {0, BPF_CGROUP_INET6_GETSOCKNAME}, + }, };static void test_prog_type_by_name (const struct sec_name_test *test)
Signature · 1 line
2.41.0
PATCH v9 2/9 bpf: Propagate modified uaddrlen from cgroup sockaddr programs
In reply to Daan De MeyerAs prep for adding unix socket support to the cgroup sockaddr hooks, let's propagate the sockaddr length back to the caller after running a bpf cgroup sockaddr hook program. While not important for AF_INET or AF_INET6, the sockaddr length is important when working with AF_UNIX sockaddrs as the size of the sockaddr cannot be determined just from the address family or the sockaddr's contents.
__cgroup_bpf_run_filter_sock_addr() is modified to take the uaddrlen as an input/output argument. After running the program, the modified sockaddr length is stored in the uaddrlen pointer.
--- include/linux/bpf-cgroup.h | 73 +++++++++++++++++++------------------- include/linux/filter.h | 1 + kernel/bpf/cgroup.c | 20 +++++++++-- net/ipv4/af_inet.c | 7 ++-- net/ipv4/ping.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 9 +++-- net/ipv6/af_inet6.c | 9 ++--- net/ipv6/ping.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 6 ++-- 11 files changed, 78 insertions(+), 55 deletions(-)
include/linux/bpf-cgroup.h +37 -36
@@ -120,6 +120,7 @@ int __cgroup_bpf_run_filter_sk(struct sock *sk,int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags);
@@ -230,22 +231,22 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND (sk) \ BPF_CGROUP_RUN_SK_PROG(sk, CGROUP_INET6_POST_BIND) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) \ +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, NULL); \ __ret; \ }) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) \ +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - t_ctx, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, t_ctx, NULL); \ release_sock(sk); \ } \ __ret; \
@@ -256,14 +257,14 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,* (at bit position 0) is to indicate CAP_NET_BIND_SERVICE capability check * should be bypassed (BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE). */ -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, bind_flags) \ +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, bind_flags) \ ({ \ u32 __flags = 0; \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, &__flags); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, &__flags); \ release_sock(sk); \ if (__flags & BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE) \ *bind_flags |= BIND_NO_CAP_NET_BIND_SERVICE; \
@@ -276,29 +277,29 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, cgroup_bpf_enabled(CGROUP_INET6_CONNECT)) && \ (sk)->sk_prot->pre_connect) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET4_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET6_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET4_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET6_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_RECVMSG, NULL) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_RECVMSG, NULL)/* The SOCK_OPS"_SK" macro should be used when sock_ops->sk is not a * fullsock and its parent fullsock cannot be traced by
@@ -477,24 +478,24 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, }#define cgroup_bpf_enabled (atype) (0) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) ({ 0; })#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) (0)#define BPF_CGROUP_RUN_PROG_INET_INGRESS (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_RELEASE (sk) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, flags) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, flags) ({ 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_INET4_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_SOCK_OPS (sock_ops) ({ 0; })#define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP (atype, major, minor, access) ({ 0; })#define BPF_CGROUP_RUN_PROG_SYSCTL (head,table,write,buf,count,pos) ({ 0; })
include/linux/filter.h +1 -0
@@ -1335,6 +1335,7 @@ struct bpf_sock_addr_kern {*/ u64 tmp_reg;void *t_ctx;/* Attach type specific context. */ +u32 uaddrlen; };struct bpf_sock_ops_kern {
kernel/bpf/cgroup.c +17 -3
@@ -1450,6 +1450,9 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);* provided by user sockaddr * @sk: sock struct that will use sockaddr * @uaddr: sockaddr struct provided by user +* @uaddrlen: Pointer to the size of the sockaddr struct provided by user. It is +* read-only for AF_INET[6] uaddr but can be modified for AF_UNIX +* uaddr. * @atype: The type of program to be executed * @t_ctx: Pointer to attach type specific context * @flags: Pointer to u32 which contains higher bits of BPF program
@@ -1462,6 +1465,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);*/ int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags)
@@ -1473,6 +1477,7 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, };struct sockaddr_storage unspec;struct cgroup *cgrp; +int ret;/* Check socket family since not all sockets represent network * endpoint (e.g. AF_UNIX).
@@ -1483,11 +1488,20 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,if (!ctx.uaddr) {memset (&unspec,0 ,sizeof (unspec)); ctx.uaddr = (struct sockaddr *)&unspec; - } + ctx.uaddrlen =0 ; + }else if (uaddrlen) + ctx.uaddrlen = *uaddrlen; +else +return -EINVAL ; cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); -return bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, -0 , flags); + ret =bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, +0 , flags); + +if (!ret && uaddrlen) + *uaddrlen = ctx.uaddrlen; + +return ret; }EXPORT_SYMBOL (__cgroup_bpf_run_filter_sock_addr);
net/ipv4/af_inet.c +4 -3
@@ -452,7 +452,7 @@ int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET4_BIND , &flags);if (err)return err;
@@ -788,6 +788,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk); DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr); +int sin_addr_len =sizeof (*sin); sin->sin_family =AF_INET ;lock_sock (sk);
@@ -800,7 +801,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, } sin->sin_port = inet->inet_dport; sin->sin_addr.s_addr = inet->inet_daddr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETPEERNAME ); }else {__be32 addr = inet->inet_rcv_saddr;
@@ -808,7 +809,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, addr = inet->inet_saddr; sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETSOCKNAME ); }release_sock (sk);
net/ipv4/ping.c +1 -1
@@ -301,7 +301,7 @@ static int ping_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
net/ipv4/tcp_ipv4.c +1 -1
@@ -194,7 +194,7 @@ static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, &addr_len); }/* This will initiate an outgoing connection. */
net/ipv4/udp.c +6 -3
@@ -1143,7 +1143,9 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP4_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, - (struct sockaddr *)usin, &ipc.addr); + (struct sockaddr *)usin, + &msg->msg_namelen, + &ipc.addr);if (err) goto out_free;if (usin) {
@@ -1865,7 +1867,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags, *addr_len =sizeof (*sin);BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, - (struct sockaddr *)sin); + (struct sockaddr *)sin, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))
@@ -1904,7 +1907,7 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }EXPORT_SYMBOL (udp_pre_connect);
net/ipv6/af_inet6.c +5 -4
@@ -454,7 +454,7 @@ int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET6_BIND , &flags);if (err)return err;
@@ -520,6 +520,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, int peer) {struct sockaddr_in6 *sin = (struct sockaddr_in6 *)uaddr; +int sin_addr_len =sizeof (*sin);struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk);struct ipv6_pinfo *np =inet6_sk (sk);
@@ -539,7 +540,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, sin->sin6_addr = sk->sk_v6_daddr;if (inet6_test_bit (SNDFLOW , sk)) sin->sin6_flowinfo = np->flow_label; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETPEERNAME ); }else {if (ipv6_addr_any (&sk->sk_v6_rcv_saddr))
@@ -547,13 +548,13 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,else sin->sin6_addr = sk->sk_v6_rcv_saddr; sin->sin6_port = inet->inet_sport; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETSOCKNAME ); } sin->sin6_scope_id =ipv6_iface_scope_id (&sin->sin6_addr, sk->sk_bound_dev_if);release_sock (sk); -return sizeof (*sin); +return sin_addr_len; }EXPORT_SYMBOL (inet6_getname);
net/ipv6/ping.c +1 -1
@@ -56,7 +56,7 @@ static int ping_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }static int ping_v6_sendmsg (struct sock *sk,struct msghdr *msg,size_t len)
net/ipv6/tcp_ipv6.c +1 -1
@@ -135,7 +135,7 @@ static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, &addr_len); } static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
net/ipv6/udp.c +4 -2
@@ -410,7 +410,8 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, *addr_len =sizeof (*sin6);BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, - (struct sockaddr *)sin6); + (struct sockaddr *)sin6, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))
@@ -1157,7 +1158,7 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }/**
@@ -1510,6 +1511,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP6_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, (struct sockaddr *)sin6, + &addr_len, &fl6->saddr);if (err) goto out_no_dst;
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v9 2/9] bpf: Propagate modified uaddrlen from cgroup sockaddr programs
From: Daan De Meyer <[email protected]>
Date: Fri, 6 Oct 2023 09:44:56 +0200
Quoted 86 lines
As prep for adding unix socket support to the cgroup sockaddr hooks, let's propagate the sockaddr length back to the caller after running a bpf cgroup sockaddr hook program. While not important for
AF_INETorAF_INET6, the sockaddr length is important when working withAF_UNIXsockaddrs as the size of the sockaddr cannot be determined just from the address family or the sockaddr's contents.
__cgroup_bpf_run_filter_sock_addr()is modified to take the uaddrlen as an input/output argument. After running the program, the modified sockaddr length is stored in the uaddrlen pointer.Signed-off-by Daan De Meyer <[email protected]>--- include/linux/bpf-cgroup.h | 73 +++++++++++++++++++------------------- include/linux/filter.h | 1 + kernel/bpf/cgroup.c | 20 +++++++++-- net/ipv4/af_inet.c | 7 ++-- net/ipv4/ping.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 9 +++-- net/ipv6/af_inet6.c | 9 ++--- net/ipv6/ping.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 6 ++-- 11 files changed, 78 insertions(+), 55 deletions(-)include/linux/bpf-cgroup.h +10
-9@@ -120,6 +120,7 @@ int __cgroup_bpf_run_filter_sk(struct sock *sk,int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags);@@ -230,22 +231,22 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND (sk) \ BPF_CGROUP_RUN_SK_PROG(sk, CGROUP_INET6_POST_BIND) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) \ +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, NULL); \ __ret; \ }) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) \ +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - t_ctx, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, t_ctx, NULL); \ release_sock(sk); \ } \ __ret; \@@ -256,14 +257,14 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,* (at bit position 0) is to indicate CAP_NET_BIND_SERVICE capability check * should be bypassed (BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE). */ -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, bind_flags) \ +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, bind_flags) \ ({ \ u32 __flags = 0; \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, &__flags); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, &__flags); \ release_sock(sk); \ if (__flags & BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE) \ *bind_flags |= BIND_NO_CAP_NET_BIND_SERVICE; \
include/linux/bpf-cgroup.h static inline bool cgroup_bpf_sock_enabled(struct sock *sk, · line 281
Quoted 7 lines
include/linux/bpf-cgroup.h +2
-2@@ -276,29 +277,29 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, cgroup_bpf_enabled(CGROUP_INET6_CONNECT)) && \ (sk)->sk_prot->pre_connect) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET4_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT)
Do we need to pass uaddrlen for INET[46] cases ?
The size of AF_INET6? addr is fixed, and we actually need not read uaddrlen. Then, we can pass NULL as uaddrlen so that we need not change the callers of these macros. Also, it would be clearer that INET[46] macros do not use uaddrlen.
#define BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr) \
- BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET4_CONNECT)
+ BPF_CGROUP_RUN_SA_PROG(sk, uaddr, NULL, CGROUP_INET4_CONNECT)
Quoted 117 lines
include/linux/bpf-cgroup.h +25
-25-#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET6_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET4_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET6_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_RECVMSG, NULL) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_RECVMSG, NULL)/* The SOCK_OPS"_SK" macro should be used when sock_ops->sk is not a * fullsock and its parent fullsock cannot be traced by @@ -477,24 +478,24 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, }#define cgroup_bpf_enabled (atype) (0) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) ({ 0; })#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) (0)#define BPF_CGROUP_RUN_PROG_INET_INGRESS (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_RELEASE (sk) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, flags) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, flags) ({ 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_INET4_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_SOCK_OPS (sock_ops) ({ 0; })#define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP (atype, major, minor, access) ({ 0; })#define BPF_CGROUP_RUN_PROG_SYSCTL (head,table,write,buf,count,pos) ({ 0; })include/linux/filter.h +1
-0@@ -1335,6 +1335,7 @@ struct bpf_sock_addr_kern {*/ u64 tmp_reg;void *t_ctx;/* Attach type specific context. */ +u32 uaddrlen; };struct bpf_sock_ops_kern {kernel/bpf/cgroup.c +5
-0@@ -1450,6 +1450,9 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);* provided by user sockaddr * @sk: sock struct that will use sockaddr * @uaddr: sockaddr struct provided by user +* @uaddrlen: Pointer to the size of the sockaddr struct provided by user. It is +* read-only for AF_INET[6] uaddr but can be modified for AF_UNIX +* uaddr. * @atype: The type of program to be executed * @t_ctx: Pointer to attach type specific context * @flags: Pointer to u32 which contains higher bits of BPF program @@ -1462,6 +1465,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);*/ int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags)@@ -1473,6 +1477,7 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, };struct sockaddr_storage unspec;struct cgroup *cgrp; +int ret;/* Check socket family since not all sockets represent network * endpoint (e.g. AF_UNIX).
kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, · line 1495
Quoted 9 lines
kernel/bpf/cgroup.c +5
-1@@ -1483,11 +1488,20 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,if (!ctx.uaddr) {memset (&unspec,0 ,sizeof (unspec)); ctx.uaddr = (struct sockaddr *)&unspec; - } + ctx.uaddrlen =0 ; + }else if (uaddrlen) + ctx.uaddrlen = *uaddrlen; +else +return -EINVAL ;
When could uaddrlen be NULL ?
kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, · line 1502
Quoted 9 lines
kernel/bpf/cgroup.c +5
-2cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); -return bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, -0 , flags); + ret =bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, +0 , flags); + +if (!ret && uaddrlen) + *uaddrlen = ctx.uaddrlen;
Now uaddrlen seems always non-NULL, so can't we pass NULL for INET macros to save hunks below.
Quoted 209 lines
kernel/bpf/cgroup.c +2
-0+ +return ret; }EXPORT_SYMBOL (__cgroup_bpf_run_filter_sock_addr);net/ipv4/af_inet.c +4
-3@@ -452,7 +452,7 @@ int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET4_BIND , &flags);if (err)return err;@@ -788,6 +788,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk); DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr); +int sin_addr_len =sizeof (*sin); sin->sin_family =AF_INET ;lock_sock (sk);@@ -800,7 +801,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, } sin->sin_port = inet->inet_dport; sin->sin_addr.s_addr = inet->inet_daddr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETPEERNAME ); }else {__be32 addr = inet->inet_rcv_saddr;@@ -808,7 +809,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, addr = inet->inet_saddr; sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETSOCKNAME ); }release_sock (sk);net/ipv4/ping.c +1
-1@@ -301,7 +301,7 @@ static int ping_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */ net/ipv4/tcp_ipv4.c +1
-1@@ -194,7 +194,7 @@ static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, &addr_len); }/* This will initiate an outgoing connection. */ net/ipv4/udp.c +6
-3@@ -1143,7 +1143,9 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP4_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, - (struct sockaddr *)usin, &ipc.addr); + (struct sockaddr *)usin, + &msg->msg_namelen, + &ipc.addr);if (err) goto out_free;if (usin) {@@ -1865,7 +1867,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags, *addr_len =sizeof (*sin);BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, - (struct sockaddr *)sin); + (struct sockaddr *)sin, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))@@ -1904,7 +1907,7 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }EXPORT_SYMBOL (udp_pre_connect);net/ipv6/af_inet6.c +5
-4@@ -454,7 +454,7 @@ int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET6_BIND , &flags);if (err)return err;@@ -520,6 +520,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, int peer) {struct sockaddr_in6 *sin = (struct sockaddr_in6 *)uaddr; +int sin_addr_len =sizeof (*sin);struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk);struct ipv6_pinfo *np =inet6_sk (sk);@@ -539,7 +540,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, sin->sin6_addr = sk->sk_v6_daddr;if (inet6_test_bit (SNDFLOW , sk)) sin->sin6_flowinfo = np->flow_label; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETPEERNAME ); }else {if (ipv6_addr_any (&sk->sk_v6_rcv_saddr))@@ -547,13 +548,13 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,else sin->sin6_addr = sk->sk_v6_rcv_saddr; sin->sin6_port = inet->inet_sport; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETSOCKNAME ); } sin->sin6_scope_id =ipv6_iface_scope_id (&sin->sin6_addr, sk->sk_bound_dev_if);release_sock (sk); -return sizeof (*sin); +return sin_addr_len; }EXPORT_SYMBOL (inet6_getname);net/ipv6/ping.c +1
-1@@ -56,7 +56,7 @@ static int ping_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }static int ping_v6_sendmsg (struct sock *sk,struct msghdr *msg,size_t len)net/ipv6/tcp_ipv6.c +1
-1@@ -135,7 +135,7 @@ static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, &addr_len); } static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,net/ipv6/udp.c +4
-2@@ -410,7 +410,8 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, *addr_len =sizeof (*sin6);BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, - (struct sockaddr *)sin6); + (struct sockaddr *)sin6, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))@@ -1157,7 +1158,7 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }/** @@ -1510,6 +1511,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP6_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, (struct sockaddr *)sin6, + &addr_len, &fl6->saddr);if (err) goto out_no_dst;Signature · 1 line
2.41.0
Re: [PATCH bpf-next v9 2/9] bpf: Propagate modified uaddrlen from cgroup sockaddr programs
Quoted 96 lines
Quoted 86 lines
As prep for adding unix socket support to the cgroup sockaddr hooks, let's propagate the sockaddr length back to the caller after running a bpf cgroup sockaddr hook program. While not important for
AF_INETorAF_INET6, the sockaddr length is important when working withAF_UNIXsockaddrs as the size of the sockaddr cannot be determined just from the address family or the sockaddr's contents.
__cgroup_bpf_run_filter_sock_addr()is modified to take the uaddrlen as an input/output argument. After running the program, the modified sockaddr length is stored in the uaddrlen pointer.Signed-off-by Daan De Meyer <[email protected]>--- include/linux/bpf-cgroup.h | 73 +++++++++++++++++++------------------- include/linux/filter.h | 1 + kernel/bpf/cgroup.c | 20 +++++++++-- net/ipv4/af_inet.c | 7 ++-- net/ipv4/ping.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/udp.c | 9 +++-- net/ipv6/af_inet6.c | 9 ++--- net/ipv6/ping.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/ipv6/udp.c | 6 ++-- 11 files changed, 78 insertions(+), 55 deletions(-)include/linux/bpf-cgroup.h +10
-9@@ -120,6 +120,7 @@ int __cgroup_bpf_run_filter_sk(struct sock *sk,int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags);@@ -230,22 +231,22 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,#define BPF_CGROUP_RUN_PROG_INET6_POST_BIND (sk) \ BPF_CGROUP_RUN_SK_PROG(sk, CGROUP_INET6_POST_BIND) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) \ +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, NULL); \ __ret; \ }) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) \ +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) \ ({ \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - t_ctx, NULL); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, t_ctx, NULL); \ release_sock(sk); \ } \ __ret; \@@ -256,14 +257,14 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,* (at bit position 0) is to indicate CAP_NET_BIND_SERVICE capability check * should be bypassed (BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE). */ -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, bind_flags) \ +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, bind_flags) \ ({ \ u32 __flags = 0; \ int __ret = 0; \ if (cgroup_bpf_enabled(atype)) { \ lock_sock(sk); \ - __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, atype, \ - NULL, &__flags); \ + __ret = __cgroup_bpf_run_filter_sock_addr(sk, uaddr, uaddrlen, \ + atype, NULL, &__flags); \ release_sock(sk); \ if (__flags & BPF_RET_BIND_NO_CAP_NET_BIND_SERVICE) \ *bind_flags |= BIND_NO_CAP_NET_BIND_SERVICE; \include/linux/bpf-cgroup.h static inline bool cgroup_bpf_sock_enabled(struct sock *sk, · line 281
Quoted 7 lines
include/linux/bpf-cgroup.h +2
-2@@ -276,29 +277,29 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk, cgroup_bpf_enabled(CGROUP_INET6_CONNECT)) && \ (sk)->sk_prot->pre_connect) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET4_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT)Do we need to pass uaddrlen for INET[46] cases ?
Quoted 9 lines
The size of
AF_INET6? addr is fixed, and we actually need not read uaddrlen. Then, we can pass NULL as uaddrlen so that we need not change the callers of these macros. Also, it would be clearer that INET[46] macros do not use uaddrlen.#define
BPF_CGROUP_RUN_PROG_INET4_CONNECT(sk, uaddr)\
-BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET4_CONNECT)
+BPF_CGROUP_RUN_SA_PROG(sk, uaddr, NULL, CGROUP_INET4_CONNECT)
The size of AF_INET6 is not always fixed (sin6_scope_id was added later), so we decided it was
safer to always pass in the sockaddr length, even if it cannot change yet, we might decide to allow
changing the size in the future and if we start passing in the addrlen now this will be easier.
Quoted 355 lines
Quoted 118 lines
include/linux/bpf-cgroup.h +25
-25-#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG(sk, uaddr, CGROUP_INET6_CONNECT) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET4_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET4_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_INET6_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT, NULL) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_SENDMSG, t_ctx) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP4_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_RECVMSG, NULL) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) \ - BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, CGROUP_UDP6_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_RECVMSG, NULL)/* The SOCK_OPS"_SK" macro should be used when sock_ops->sk is not a * fullsock and its parent fullsock cannot be traced by @@ -477,24 +478,24 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, }#define cgroup_bpf_enabled (atype) (0) -#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, atype, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, atype) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG_LOCK (sk, uaddr, uaddrlen, atype, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_SA_PROG (sk, uaddr, uaddrlen, atype) ({ 0; })#define BPF_CGROUP_PRE_CONNECT_ENABLED (sk) (0)#define BPF_CGROUP_RUN_PROG_INET_INGRESS (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_RELEASE (sk) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, atype, flags) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, uaddrlen, atype, flags) ({ 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_INET4_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, t_ctx) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr) ({ 0; }) -#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_SOCK_OPS (sock_ops) ({ 0; })#define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP (atype, major, minor, access) ({ 0; })#define BPF_CGROUP_RUN_PROG_SYSCTL (head,table,write,buf,count,pos) ({ 0; })include/linux/filter.h +1
-0@@ -1335,6 +1335,7 @@ struct bpf_sock_addr_kern {*/ u64 tmp_reg;void *t_ctx;/* Attach type specific context. */ +u32 uaddrlen; };struct bpf_sock_ops_kern {kernel/bpf/cgroup.c +5
-0@@ -1450,6 +1450,9 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);* provided by user sockaddr * @sk: sock struct that will use sockaddr * @uaddr: sockaddr struct provided by user +* @uaddrlen: Pointer to the size of the sockaddr struct provided by user. It is +* read-only for AF_INET[6] uaddr but can be modified for AF_UNIX +* uaddr. * @atype: The type of program to be executed * @t_ctx: Pointer to attach type specific context * @flags: Pointer to u32 which contains higher bits of BPF program @@ -1462,6 +1465,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);*/ int __cgroup_bpf_run_filter_sock_addr (struct sock *sk,struct sockaddr *uaddr, +int *uaddrlen,enum cgroup_bpf_attach_type atype,void *t_ctx,u32 *flags)@@ -1473,6 +1477,7 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, };struct sockaddr_storage unspec;struct cgroup *cgrp; +int ret;/* Check socket family since not all sockets represent network * endpoint (e.g. AF_UNIX). kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, · line 1495
Quoted 9 lines
kernel/bpf/cgroup.c +5
-1@@ -1483,11 +1488,20 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,if (!ctx.uaddr) {memset (&unspec,0 ,sizeof (unspec)); ctx.uaddr = (struct sockaddr *)&unspec; - } + ctx.uaddrlen =0 ; + }else if (uaddrlen) + ctx.uaddrlen = *uaddrlen; +else +return -EINVAL ;When could uaddrlen be NULL ?
kernel/bpf/cgroup.c int __cgroup_bpf_run_filter_sock_addr(struct sock *sk, · line 1502
Quoted 9 lines
kernel/bpf/cgroup.c +5
-2cgrp =sock_cgroup_ptr (&sk->sk_cgrp_data); -return bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, -0 , flags); + ret =bpf_prog_run_array_cg (&cgrp->bpf, atype, &ctx, bpf_prog_run, +0 , flags); + +if (!ret && uaddrlen) + *uaddrlen = ctx.uaddrlen;Now uaddrlen seems always non-NULL, so can't we pass NULL for INET macros to save hunks below.
Quoted 209 lines
kernel/bpf/cgroup.c +2
-0+ +return ret; }EXPORT_SYMBOL (__cgroup_bpf_run_filter_sock_addr);net/ipv4/af_inet.c +4
-3@@ -452,7 +452,7 @@ int inet_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET4_BIND , &flags);if (err)return err;@@ -788,6 +788,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk); DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr); +int sin_addr_len =sizeof (*sin); sin->sin_family =AF_INET ;lock_sock (sk);@@ -800,7 +801,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, } sin->sin_port = inet->inet_dport; sin->sin_addr.s_addr = inet->inet_daddr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETPEERNAME ); }else {__be32 addr = inet->inet_rcv_saddr;@@ -808,7 +809,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr, addr = inet->inet_saddr; sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET4_GETSOCKNAME ); }release_sock (sk);net/ipv4/ping.c +1
-1@@ -301,7 +301,7 @@ static int ping_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }/* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */ net/ipv4/tcp_ipv4.c +1
-1@@ -194,7 +194,7 @@ static int tcp_v4_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT (sk, uaddr, &addr_len); }/* This will initiate an outgoing connection. */ net/ipv4/udp.c +6
-3@@ -1143,7 +1143,9 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP4_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, - (struct sockaddr *)usin, &ipc.addr); + (struct sockaddr *)usin, + &msg->msg_namelen, + &ipc.addr);if (err) goto out_free;if (usin) {@@ -1865,7 +1867,8 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags, *addr_len =sizeof (*sin);BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, - (struct sockaddr *)sin); + (struct sockaddr *)sin, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))@@ -1904,7 +1907,7 @@ int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)if (addr_len <sizeof (struct sockaddr_in ))return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, &addr_len); }EXPORT_SYMBOL (udp_pre_connect);net/ipv6/af_inet6.c +5
-4@@ -454,7 +454,7 @@ int inet6_bind_sk(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* BPF prog is run before any checks are done so that if the prog * changes context in a wrong way it will be caught. */ - err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, + err =BPF_CGROUP_RUN_PROG_INET_BIND_LOCK (sk, uaddr, &addr_len,CGROUP_INET6_BIND , &flags);if (err)return err;@@ -520,6 +520,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, int peer) {struct sockaddr_in6 *sin = (struct sockaddr_in6 *)uaddr; +int sin_addr_len =sizeof (*sin);struct sock *sk = sock->sk;struct inet_sock *inet =inet_sk (sk);struct ipv6_pinfo *np =inet6_sk (sk);@@ -539,7 +540,7 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr, sin->sin6_addr = sk->sk_v6_daddr;if (inet6_test_bit (SNDFLOW , sk)) sin->sin6_flowinfo = np->flow_label; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETPEERNAME ); }else {if (ipv6_addr_any (&sk->sk_v6_rcv_saddr))@@ -547,13 +548,13 @@ int inet6_getname(struct socket *sock, struct sockaddr *uaddr,else sin->sin6_addr = sk->sk_v6_rcv_saddr; sin->sin6_port = inet->inet_sport; -BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, +BPF_CGROUP_RUN_SA_PROG (sk, (struct sockaddr *)sin, &sin_addr_len,CGROUP_INET6_GETSOCKNAME ); } sin->sin6_scope_id =ipv6_iface_scope_id (&sin->sin6_addr, sk->sk_bound_dev_if);release_sock (sk); -return sizeof (*sin); +return sin_addr_len; }EXPORT_SYMBOL (inet6_getname);net/ipv6/ping.c +1
-1@@ -56,7 +56,7 @@ static int ping_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }static int ping_v6_sendmsg (struct sock *sk,struct msghdr *msg,size_t len)net/ipv6/tcp_ipv6.c +1
-1@@ -135,7 +135,7 @@ static int tcp_v6_pre_connect(struct sock *sk, struct sockaddr *uaddr,sock_owned_by_me (sk); -return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, &addr_len); } static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,net/ipv6/udp.c +4
-3@@ -410,7 +410,8 @@ int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, *addr_len =sizeof (*sin6);BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, - (struct sockaddr *)sin6); + (struct sockaddr *)sin6, + addr_len); }if (udp_test_bit (GRO_ENABLED , sk))@@ -1157,7 +1158,7 @@ static int udpv6_pre_connect(struct sock *sk, struct sockaddr *uaddr,if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ; -return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr); +return BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, &addr_len); }/** @@ -1510,6 +1511,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)if (cgroup_bpf_enabled (CGROUP_UDP6_SENDMSG ) && !connected) { err =BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, (struct sockaddr *)sin6, + &addr_len, &fl6->saddr);if (err) goto out_no_dst; --2.41.0
PATCH v9 3/9 bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr from bpf
In reply to Daan De MeyerAs prep for adding unix socket support to the cgroup sockaddr hooks, let's add a kfunc bpf_sock_addr_set_unix_addr() that allows modifying a sockaddr from bpf. While this is already possible for AF_INET and AF_INET6, we'll need this kfunc when we add unix socket support since modifying the address for those requires modifying both the address and the sockaddr length.
--- kernel/bpf/btf.c | 1 + net/core/filter.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-)
kernel/bpf/btf.c +1 -0
@@ -7850,6 +7850,7 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type)case BPF_PROG_TYPE_SYSCALL :return BTF_KFUNC_HOOK_SYSCALL ;case BPF_PROG_TYPE_CGROUP_SKB : +case BPF_PROG_TYPE_CGROUP_SOCK_ADDR :return BTF_KFUNC_HOOK_CGROUP_SKB ;case BPF_PROG_TYPE_SCHED_ACT :return BTF_KFUNC_HOOK_SCHED_ACT ;
net/core/filter.c +33 -1
@@ -81,6 +81,7 @@#include <net/xdp.h> #include <net/mptcp.h> #include <net/netfilter/nf_conntrack_bpf.h> +#include <linux/un.h> static const struct bpf_func_proto *bpf_sk_base_func_proto (enum bpf_func_id func_id);
@@ -11752,6 +11753,26 @@ __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags,return 0 ; } + +__bpf_kfunc int bpf_sock_addr_set_unix_addr(struct bpf_sock_addr_kern *sa_kern, +const u8 *addr,u32 addrlen__sz) +{ +struct sockaddr *sa = sa_kern->uaddr; +struct sockaddr_un *un; + +if (sa_kern->sk->sk_family !=AF_UNIX ) +return -EINVAL ; + +/* We do not allow changing the address of unnamed unix sockets. */ +if (addrlen__sz ==0 || addrlen__sz >UNIX_PATH_MAX ) +return -EINVAL ; + + un = (struct sockaddr_un *)sa; +memcpy (un->sun_path, addr, addrlen__sz); + sa_kern->uaddrlen = offsetof(struct sockaddr_un , sun_path) + addrlen__sz; + +return 0 ; +}__diag_pop (); int bpf_dynptr_from_skb_rdonly(struct sk_buff *skb, u64 flags,
@@ -11776,6 +11797,10 @@ BTF_SET8_START(bpf_kfunc_check_set_xdp) BTF_ID_FLAGS(func, bpf_dynptr_from_xdp)BTF_SET8_END (bpf_kfunc_check_set_xdp) +BTF_SET8_START (bpf_kfunc_check_set_sock_addr ) +BTF_ID_FLAGS (func, bpf_sock_addr_set_unix_addr) +BTF_SET8_END (bpf_kfunc_check_set_sock_addr) + static const struct btf_kfunc_id_set bpf_kfunc_set_skb = { .owner =THIS_MODULE , .set = &bpf_kfunc_check_set_skb,
@@ -11786,6 +11811,11 @@ static const struct btf_kfunc_id_set bpf_kfunc_set_xdp = { .set = &bpf_kfunc_check_set_xdp, }; +static const struct btf_kfunc_id_set bpf_kfunc_set_sock_addr = { + .owner =THIS_MODULE , + .set = &bpf_kfunc_check_set_sock_addr, +}; +static int __init bpf_kfunc_init (void ) {int ret;
@@ -11800,7 +11830,9 @@ static int __init bpf_kfunc_init(void) ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_LWT_XMIT , &bpf_kfunc_set_skb); ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_LWT_SEG6LOCAL , &bpf_kfunc_set_skb); ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_NETFILTER , &bpf_kfunc_set_skb); -return ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_XDP , &bpf_kfunc_set_xdp); + ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_XDP , &bpf_kfunc_set_xdp); +return ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_CGROUP_SOCK_ADDR , + &bpf_kfunc_set_sock_addr); }late_initcall (bpf_kfunc_init);
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v9 3/9] bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr from bpf
From: Daan De Meyer <[email protected]>
Date: Fri, 6 Oct 2023 09:44:57 +0200
Quoted 38 lines
As prep for adding unix socket support to the cgroup sockaddr hooks, let's add a kfunc
bpf_sock_addr_set_unix_addr()that allows modifying a sockaddr from bpf. While this is already possible forAF_INETandAF_INET6, we'll need this kfunc when we add unix socket support since modifying the address for those requires modifying both the address and the sockaddr length.Signed-off-by Daan De Meyer <[email protected]>--- kernel/bpf/btf.c | 1 + net/core/filter.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-)kernel/bpf/btf.c +1
-0@@ -7850,6 +7850,7 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type)case BPF_PROG_TYPE_SYSCALL :return BTF_KFUNC_HOOK_SYSCALL ;case BPF_PROG_TYPE_CGROUP_SKB : +case BPF_PROG_TYPE_CGROUP_SOCK_ADDR :return BTF_KFUNC_HOOK_CGROUP_SKB ;case BPF_PROG_TYPE_SCHED_ACT :return BTF_KFUNC_HOOK_SCHED_ACT ;net/core/filter.c +1
-0@@ -81,6 +81,7 @@#include <net/xdp.h> #include <net/mptcp.h> #include <net/netfilter/nf_conntrack_bpf.h> +#include <linux/un.h> static const struct bpf_func_proto *bpf_sk_base_func_proto (enum bpf_func_id func_id);
net/core/filter.c __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, · line 11758
Quoted 6 lines
net/core/filter.c +3
-0@@ -11752,6 +11753,26 @@ __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags,return 0 ; } + +__bpf_kfunc int bpf_sock_addr_set_unix_addr(struct bpf_sock_addr_kern *sa_kern, +const u8 *addr,u32 addrlen__sz)
I'd rename addrlen__sz to sun_path_len or something else because the conventional addrlen for AF_UNIX contains offsetof(struct sockaddr_un, sun_path).
Also it would be good to document that the length is of sun_path[].
net/core/filter.c __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, · line 11766
Quoted 8 lines
net/core/filter.c +8
-0+{ +struct sockaddr *sa = sa_kern->uaddr; +struct sockaddr_un *un; + +if (sa_kern->sk->sk_family !=AF_UNIX ) +return -EINVAL ; + +/* We do not allow changing the address of unnamed unix sockets. */
This comment is slightly confusing as addrlen__sz is a user-specified value for destination address of named sockets except for getsockname().
So, probably we can just remove the comment. (or s/of/to/ ?)
Quoted 48 lines
net/core/filter.c +21
-1+if (addrlen__sz ==0 || addrlen__sz >UNIX_PATH_MAX ) +return -EINVAL ; + + un = (struct sockaddr_un *)sa; +memcpy (un->sun_path, addr, addrlen__sz); + sa_kern->uaddrlen = offsetof(struct sockaddr_un , sun_path) + addrlen__sz; + +return 0 ; +}__diag_pop (); int bpf_dynptr_from_skb_rdonly(struct sk_buff *skb, u64 flags,@@ -11776,6 +11797,10 @@ BTF_SET8_START(bpf_kfunc_check_set_xdp) BTF_ID_FLAGS(func, bpf_dynptr_from_xdp)BTF_SET8_END (bpf_kfunc_check_set_xdp) +BTF_SET8_START (bpf_kfunc_check_set_sock_addr ) +BTF_ID_FLAGS (func, bpf_sock_addr_set_unix_addr) +BTF_SET8_END (bpf_kfunc_check_set_sock_addr) + static const struct btf_kfunc_id_set bpf_kfunc_set_skb = { .owner =THIS_MODULE , .set = &bpf_kfunc_check_set_skb,@@ -11786,6 +11811,11 @@ static const struct btf_kfunc_id_set bpf_kfunc_set_xdp = { .set = &bpf_kfunc_check_set_xdp, }; +static const struct btf_kfunc_id_set bpf_kfunc_set_sock_addr = { + .owner =THIS_MODULE , + .set = &bpf_kfunc_check_set_sock_addr, +}; +static int __init bpf_kfunc_init (void ) {int ret;@@ -11800,7 +11830,9 @@ static int __init bpf_kfunc_init(void) ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_LWT_XMIT , &bpf_kfunc_set_skb); ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_LWT_SEG6LOCAL , &bpf_kfunc_set_skb); ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_NETFILTER , &bpf_kfunc_set_skb); -return ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_XDP , &bpf_kfunc_set_xdp); + ret = ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_XDP , &bpf_kfunc_set_xdp); +return ret ?:register_btf_kfunc_id_set (BPF_PROG_TYPE_CGROUP_SOCK_ADDR , + &bpf_kfunc_set_sock_addr); }late_initcall (bpf_kfunc_init);Signature · 1 line
2.41.0
Martin KaFai Lau
reviewerRe: [PATCH bpf-next v9 3/9] bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr from bpf
Quoted 5 lines · Kuniyuki Iwashima
net/core/filter.c __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, · line 11758
Quoted 2 lines
net/core/filter.c +2
-0+__bpf_kfunc int bpf_sock_addr_set_unix_addr(struct bpf_sock_addr_kern *sa_kern, +const u8 *addr,u32 addrlen__sz)I'd rename
addrlen__sztosun_path_lenor something else because the conventional addrlen forAF_UNIXcontainsoffsetof(struct sockaddr_un, sun_path).
The "__sz" suffix is required by the verifier. It is the size of the preceding argument "addr". While at it, addrlen__sz should be just "addr__sz" (or sun_path__sz, depending on what name is decided here) for consistency with other kfunc.
I don't have strong preference on the argument name. However, if it is sun_path__sz, then the preceding argument should be renamed to "sun_path" also for consistency reason and then the kfunc should probably be renamed to bpf_sock_addr_set_sun_path.
Re: [PATCH bpf-next v9 3/9] bpf: Add bpf_sock_addr_set_unix_addr() to allow writing unix sockaddr from bpf
From: Martin KaFai Lau <[email protected]>
Date: Tue, 10 Oct 2023 13:07:54 -0700
Quoted 11 lines · Kuniyuki Iwashima
Quoted 5 lines
net/core/filter.c __bpf_kfunc int bpf_dynptr_from_xdp(struct xdp_buff *xdp, u64 flags, · line 11758
Quoted 2 lines
net/core/filter.c +2
-0+__bpf_kfunc int bpf_sock_addr_set_unix_addr(struct bpf_sock_addr_kern *sa_kern, +const u8 *addr,u32 addrlen__sz)I'd rename
addrlen__sztosun_path_lenor something else because the conventional addrlen forAF_UNIXcontainsoffsetof(struct sockaddr_un, sun_path).The "
__sz" suffix is required by the verifier. It is the size of the preceding argument "addr". While at it,addrlen__szshould be just "addr__sz" (orsun_path__sz, depending on what name is decided here) for consistency with other kfunc.
I didn't know that, thank you!
Quoted 5 lines
I don't have strong preference on the argument name. However, if it is
sun_path__sz, then the preceding argument should be renamed to "sun_path" also for consistency reason and then the kfunc should probably be renamed tobpf_sock_addr_set_sun_path.
I prefer sun_path, sun_path__sz, and bpf_sock_addr_set_sun_path() that are clearer and consistent with uAPI, sockaddr_un.sun_path.
PATCH v9 4/9 bpf: Implement cgroup sockaddr hooks for unix sockets
In reply to Daan De MeyerThese hooks allows intercepting connect(), getsockname(), getpeername(), sendmsg() and recvmsg() for unix sockets. The unix socket hooks get write access to the address length because the address length is not fixed when dealing with unix sockets and needs to be modified when a unix socket address is modified by the hook. Because abstract socket unix addresses start with a NUL byte, we cannot recalculate the socket address in kernelspace after running the hook by calculating the length of the unix socket path using strlen().
These hooks can be used when users want to multiplex syscall to a single unix socket to multiple different processes behind the scenes by redirecting the connect() and other syscalls to process specific sockets.
We do not implement support for intercepting bind() because when using bind() with unix sockets with a pathname address, this creates an inode in the filesystem which must be cleaned up. If we rewrite the address, the user might try to clean up the wrong file, leaking the socket in the filesystem where it is never cleaned up. Until we figure out a solution for this (and a use case for intercepting bind()), we opt to not allow rewriting the sockaddr in bind() calls.
We also implement recvmsg() support for connected streams so that after a connect() that is modified by a sockaddr hook, any corresponding recmvsg() on the connected socket can also be modified to make the connected program think it is connected to the "intended" remote.
--- include/linux/bpf-cgroup-defs.h | 5 +++++ include/linux/bpf-cgroup.h | 17 ++++++++++++++++ include/uapi/linux/bpf.h | 13 ++++++++---- kernel/bpf/cgroup.c | 11 ++++++++-- kernel/bpf/syscall.c | 15 ++++++++++++++ kernel/bpf/verifier.c | 5 ++++- net/core/filter.c | 14 +++++++++++-- net/unix/af_unix.c | 36 ++++++++++++++++++++++++++++++++- tools/include/uapi/linux/bpf.h | 13 ++++++++---- 9 files changed, 115 insertions(+), 14 deletions(-)
include/linux/bpf-cgroup-defs.h +5 -0
@@ -28,19 +28,24 @@ enum cgroup_bpf_attach_type {CGROUP_INET6_BIND ,CGROUP_INET4_CONNECT ,CGROUP_INET6_CONNECT , +CGROUP_UNIX_CONNECT ,CGROUP_INET4_POST_BIND ,CGROUP_INET6_POST_BIND ,CGROUP_UDP4_SENDMSG ,CGROUP_UDP6_SENDMSG , +CGROUP_UNIX_SENDMSG ,CGROUP_SYSCTL ,CGROUP_UDP4_RECVMSG ,CGROUP_UDP6_RECVMSG , +CGROUP_UNIX_RECVMSG ,CGROUP_GETSOCKOPT ,CGROUP_SETSOCKOPT ,CGROUP_INET4_GETPEERNAME ,CGROUP_INET6_GETPEERNAME , +CGROUP_UNIX_GETPEERNAME ,CGROUP_INET4_GETSOCKNAME ,CGROUP_INET6_GETSOCKNAME , +CGROUP_UNIX_GETSOCKNAME ,CGROUP_INET_SOCK_RELEASE ,CGROUP_LSM_START , CGROUP_LSM_END = CGROUP_LSM_START + CGROUP_LSM_NUM - 1,
include/linux/bpf-cgroup.h +17 -0
@@ -48,19 +48,24 @@ to_cgroup_bpf_attach_type(enum bpf_attach_type attach_type)CGROUP_ATYPE (CGROUP_INET6_BIND );CGROUP_ATYPE (CGROUP_INET4_CONNECT );CGROUP_ATYPE (CGROUP_INET6_CONNECT ); +CGROUP_ATYPE (CGROUP_UNIX_CONNECT );CGROUP_ATYPE (CGROUP_INET4_POST_BIND );CGROUP_ATYPE (CGROUP_INET6_POST_BIND );CGROUP_ATYPE (CGROUP_UDP4_SENDMSG );CGROUP_ATYPE (CGROUP_UDP6_SENDMSG ); +CGROUP_ATYPE (CGROUP_UNIX_SENDMSG );CGROUP_ATYPE (CGROUP_SYSCTL );CGROUP_ATYPE (CGROUP_UDP4_RECVMSG );CGROUP_ATYPE (CGROUP_UDP6_RECVMSG ); +CGROUP_ATYPE (CGROUP_UNIX_RECVMSG );CGROUP_ATYPE (CGROUP_GETSOCKOPT );CGROUP_ATYPE (CGROUP_SETSOCKOPT );CGROUP_ATYPE (CGROUP_INET4_GETPEERNAME );CGROUP_ATYPE (CGROUP_INET6_GETPEERNAME ); +CGROUP_ATYPE (CGROUP_UNIX_GETPEERNAME );CGROUP_ATYPE (CGROUP_INET4_GETSOCKNAME );CGROUP_ATYPE (CGROUP_INET6_GETSOCKNAME ); +CGROUP_ATYPE (CGROUP_UNIX_GETSOCKNAME );CGROUP_ATYPE (CGROUP_INET_SOCK_RELEASE );default :return CGROUP_BPF_ATTACH_TYPE_INVALID ;
@@ -289,18 +294,27 @@ static inline bool cgroup_bpf_sock_enabled(struct sock *sk,#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_INET6_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_UNIX_CONNECT_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UNIX_CONNECT, NULL) +#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_SENDMSG, t_ctx)#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UNIX_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UNIX_SENDMSG, t_ctx) +#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP4_RECVMSG, NULL)#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UDP6_RECVMSG, NULL) +#define BPF_CGROUP_RUN_PROG_UNIX_RECVMSG_LOCK (sk, uaddr, uaddrlen) \ + BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, uaddrlen, CGROUP_UNIX_RECVMSG, NULL) +/* The SOCK_OPS"_SK" macro should be used when sock_ops->sk is not a * fullsock and its parent fullsock cannot be traced by * sk_to_full_sk().
@@ -492,10 +506,13 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,#define BPF_CGROUP_RUN_PROG_INET4_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_INET6_CONNECT (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UNIX_CONNECT_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; })#define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UNIX_SENDMSG_LOCK (sk, uaddr, uaddrlen, t_ctx) ({ 0; })#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; }) +#define BPF_CGROUP_RUN_PROG_UNIX_RECVMSG_LOCK (sk, uaddr, uaddrlen) ({ 0; })#define BPF_CGROUP_RUN_PROG_SOCK_OPS (sock_ops) ({ 0; })#define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP (atype, major, minor, access) ({ 0; })#define BPF_CGROUP_RUN_PROG_SYSCTL (head,table,write,buf,count,pos) ({ 0; })
include/uapi/linux/bpf.h +9 -4
@@ -1047,6 +1047,11 @@ enum bpf_attach_type {BPF_TCX_INGRESS ,BPF_TCX_EGRESS ,BPF_TRACE_UPROBE_MULTI , +BPF_CGROUP_UNIX_CONNECT , +BPF_CGROUP_UNIX_SENDMSG , +BPF_CGROUP_UNIX_RECVMSG , +BPF_CGROUP_UNIX_GETPEERNAME , +BPF_CGROUP_UNIX_GETSOCKNAME , __MAX_BPF_ATTACH_TYPE };
@@ -2704,8 +2709,8 @@ union bpf_attr {* *bpf_socket* should be one of the following: * * * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**. -* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT** -* and **BPF_CGROUP_INET6_CONNECT**. +* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**, +* **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**. * * This helper actually implements a subset of **setsockopt()**. * It supports the following *level*\ s:
@@ -2943,8 +2948,8 @@ union bpf_attr {* *bpf_socket* should be one of the following: * * * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**. -* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT** -* and **BPF_CGROUP_INET6_CONNECT**. +* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**, +* **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**. * * This helper actually implements a subset of **getsockopt()**. * It supports the same set of *optname*\ s that is supported by
kernel/bpf/cgroup.c +9 -2
@@ -1458,7 +1458,7 @@ EXPORT_SYMBOL(__cgroup_bpf_run_filter_sk);* @flags: Pointer to u32 which contains higher bits of BPF program * return value (OR'ed together). * -* socket is expected to be of type INET or INET6. +* socket is expected to be of type INET, INET6 or UNIX. * * This function will return %-EPERM if an attached program is found and * returned value != 1 during execution. In all other cases, 0 is returned.
@@ -1482,7 +1482,8 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,/* Check socket family since not all sockets represent network * endpoint (e.g. AF_UNIX). */ -if (sk->sk_family !=AF_INET && sk->sk_family !=AF_INET6 ) +if (sk->sk_family !=AF_INET && sk->sk_family !=AF_INET6 && + sk->sk_family !=AF_UNIX )return 0 ;if (!ctx.uaddr) {
@@ -2534,10 +2535,13 @@ cgroup_common_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_CGROUP_SOCK_OPS :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :return NULL ;default :return &bpf_get_retval_proto;
@@ -2549,10 +2553,13 @@ cgroup_common_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_CGROUP_SOCK_OPS :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :return NULL ;default :return &bpf_set_retval_proto;
kernel/bpf/syscall.c +15 -0
@@ -2446,14 +2446,19 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type,case BPF_CGROUP_INET6_BIND :case BPF_CGROUP_INET4_CONNECT :case BPF_CGROUP_INET6_CONNECT : +case BPF_CGROUP_UNIX_CONNECT :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :case BPF_CGROUP_UDP4_SENDMSG :case BPF_CGROUP_UDP6_SENDMSG : +case BPF_CGROUP_UNIX_SENDMSG :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :return 0 ;default :return -EINVAL ;
@@ -3678,14 +3683,19 @@ attach_type_to_prog_type(enum bpf_attach_type attach_type)case BPF_CGROUP_INET6_BIND :case BPF_CGROUP_INET4_CONNECT :case BPF_CGROUP_INET6_CONNECT : +case BPF_CGROUP_UNIX_CONNECT :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :case BPF_CGROUP_UDP4_SENDMSG :case BPF_CGROUP_UDP6_SENDMSG : +case BPF_CGROUP_UNIX_SENDMSG :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :return BPF_PROG_TYPE_CGROUP_SOCK_ADDR ;case BPF_CGROUP_SOCK_OPS :return BPF_PROG_TYPE_SOCK_OPS ;
@@ -3942,14 +3952,19 @@ static int bpf_prog_query(const union bpf_attr *attr,case BPF_CGROUP_INET6_POST_BIND :case BPF_CGROUP_INET4_CONNECT :case BPF_CGROUP_INET6_CONNECT : +case BPF_CGROUP_UNIX_CONNECT :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :case BPF_CGROUP_UDP4_SENDMSG :case BPF_CGROUP_UDP6_SENDMSG : +case BPF_CGROUP_UNIX_SENDMSG :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :case BPF_CGROUP_SOCK_OPS :case BPF_CGROUP_DEVICE :case BPF_CGROUP_SYSCTL :
kernel/bpf/verifier.c +4 -1
@@ -14797,10 +14797,13 @@ static int check_return_code(struct bpf_verifier_env *env, int regno)case BPF_PROG_TYPE_CGROUP_SOCK_ADDR :if (env->prog->expected_attach_type ==BPF_CGROUP_UDP4_RECVMSG || env->prog->expected_attach_type ==BPF_CGROUP_UDP6_RECVMSG || + env->prog->expected_attach_type ==BPF_CGROUP_UNIX_RECVMSG || env->prog->expected_attach_type ==BPF_CGROUP_INET4_GETPEERNAME || env->prog->expected_attach_type ==BPF_CGROUP_INET6_GETPEERNAME || + env->prog->expected_attach_type ==BPF_CGROUP_UNIX_GETPEERNAME || env->prog->expected_attach_type ==BPF_CGROUP_INET4_GETSOCKNAME || - env->prog->expected_attach_type ==BPF_CGROUP_INET6_GETSOCKNAME ) + env->prog->expected_attach_type ==BPF_CGROUP_INET6_GETSOCKNAME || + env->prog->expected_attach_type ==BPF_CGROUP_UNIX_GETSOCKNAME ) range =tnum_range (1 ,1 );if (env->prog->expected_attach_type ==BPF_CGROUP_INET4_BIND || env->prog->expected_attach_type ==BPF_CGROUP_INET6_BIND )
net/core/filter.c +12 -2
@@ -7859,14 +7859,19 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_CGROUP_INET6_BIND :case BPF_CGROUP_INET4_CONNECT :case BPF_CGROUP_INET6_CONNECT : +case BPF_CGROUP_UNIX_CONNECT :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :case BPF_CGROUP_UDP4_SENDMSG :case BPF_CGROUP_UDP6_SENDMSG : +case BPF_CGROUP_UNIX_SENDMSG :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :return &bpf_sock_addr_setsockopt_proto;default :return NULL ;
@@ -7877,14 +7882,19 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)case BPF_CGROUP_INET6_BIND :case BPF_CGROUP_INET4_CONNECT :case BPF_CGROUP_INET6_CONNECT : +case BPF_CGROUP_UNIX_CONNECT :case BPF_CGROUP_UDP4_RECVMSG :case BPF_CGROUP_UDP6_RECVMSG : +case BPF_CGROUP_UNIX_RECVMSG :case BPF_CGROUP_UDP4_SENDMSG :case BPF_CGROUP_UDP6_SENDMSG : +case BPF_CGROUP_UNIX_SENDMSG :case BPF_CGROUP_INET4_GETPEERNAME :case BPF_CGROUP_INET6_GETPEERNAME : +case BPF_CGROUP_UNIX_GETPEERNAME :case BPF_CGROUP_INET4_GETSOCKNAME :case BPF_CGROUP_INET6_GETSOCKNAME : +case BPF_CGROUP_UNIX_GETSOCKNAME :return &bpf_sock_addr_getsockopt_proto;default :return NULL ;
@@ -8932,8 +8942,8 @@ static bool sock_addr_is_valid_access(int off, int size,if (off % size !=0 )return false; -/* Disallow access to IPv6 fields from IPv4 contex and vise -* versa. +/* Disallow access to fields not belonging to the attach type's address +* family. */ switch (off) { case bpf_ctx_range(struct bpf_sock_addr, user_ip4):
net/unix/af_unix.c +35 -1
@@ -116,6 +116,7 @@#include <linux/freezer.h> #include <linux/file.h> #include <linux/btf_ids.h> +#include <linux/bpf-cgroup.h> #include "scm.h"
@@ -1377,6 +1378,10 @@ static int unix_dgram_connect(struct socket *sock, struct sockaddr *addr, goto out;if (addr->sa_family !=AF_UNSPEC ) { + err =BPF_CGROUP_RUN_PROG_UNIX_CONNECT_LOCK (sk, addr, &alen); +if (err) + goto out; + err =unix_validate_addr (sunaddr, alen);if (err) goto out;
@@ -1486,6 +1491,10 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,int err;int st; + err =BPF_CGROUP_RUN_PROG_UNIX_CONNECT_LOCK (sk, uaddr, &addr_len); +if (err) + goto out; + err =unix_validate_addr (sunaddr, addr_len);if (err) goto out;
@@ -1771,6 +1780,14 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int peer) err = addr->len;memcpy (sunaddr, addr->name, addr->len); } + +if (peer) +BPF_CGROUP_RUN_SA_PROG (sk, uaddr, &err, +CGROUP_UNIX_GETPEERNAME ); +else +BPF_CGROUP_RUN_SA_PROG (sk, uaddr, &err, +CGROUP_UNIX_GETSOCKNAME ); +sock_put (sk); out:return err;
@@ -1919,6 +1936,13 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, goto out;if (msg->msg_namelen) { + err =BPF_CGROUP_RUN_PROG_UNIX_SENDMSG_LOCK (sk, + msg->msg_name, + &msg->msg_namelen, +NULL ); +if (err) + goto out; + err =unix_validate_addr (sunaddr, msg->msg_namelen);if (err) goto out;
@@ -2390,9 +2414,14 @@ int __unix_dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t size,EPOLLOUT |EPOLLWRNORM | EPOLLWRBAND); -if (msg->msg_name) +if (msg->msg_name) {unix_copy_addr (msg, skb->sk); +BPF_CGROUP_RUN_PROG_UNIX_RECVMSG_LOCK (sk, + msg->msg_name, + &msg->msg_namelen); + } +if (size > skb->len - skip) size = skb->len - skip;else if (size < skb->len - skip)
@@ -2744,6 +2773,11 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, state->msg->msg_name);unix_copy_addr (state->msg, skb->sk); + +BPF_CGROUP_RUN_PROG_UNIX_RECVMSG_LOCK (sk, + state->msg->msg_name, + &state->msg->msg_namelen); + sunaddr =NULL ; }
tools/include/uapi/linux/bpf.h +9 -4
@@ -1047,6 +1047,11 @@ enum bpf_attach_type {BPF_TCX_INGRESS ,BPF_TCX_EGRESS ,BPF_TRACE_UPROBE_MULTI , +BPF_CGROUP_UNIX_CONNECT , +BPF_CGROUP_UNIX_SENDMSG , +BPF_CGROUP_UNIX_RECVMSG , +BPF_CGROUP_UNIX_GETPEERNAME , +BPF_CGROUP_UNIX_GETSOCKNAME , __MAX_BPF_ATTACH_TYPE };
@@ -2704,8 +2709,8 @@ union bpf_attr {* *bpf_socket* should be one of the following: * * * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**. -* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT** -* and **BPF_CGROUP_INET6_CONNECT**. +* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**, +* **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**. * * This helper actually implements a subset of **setsockopt()**. * It supports the following *level*\ s:
@@ -2943,8 +2948,8 @@ union bpf_attr {* *bpf_socket* should be one of the following: * * * **struct bpf_sock_ops** for **BPF_PROG_TYPE_SOCK_OPS**. -* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT** -* and **BPF_CGROUP_INET6_CONNECT**. +* * **struct bpf_sock_addr** for **BPF_CGROUP_INET4_CONNECT**, +* **BPF_CGROUP_INET6_CONNECT** and **BPF_CGROUP_UNIX_CONNECT**. * * This helper actually implements a subset of **getsockopt()**. * It supports the same set of *optname*\ s that is supported by
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v9 4/9] bpf: Implement cgroup sockaddr hooks for unix sockets
From: Daan De Meyer <[email protected]>
Date: Fri, 6 Oct 2023 09:44:58 +0200
Quoted 23 lines
These hooks allows intercepting
connect(),getsockname(),getpeername(),sendmsg()andrecvmsg()for unix sockets. The unix socket hooks get write access to the address length because the address length is not fixed when dealing with unix sockets and needs to be modified when a unix socket address is modified by the hook. Because abstract socket unix addresses start with a NUL byte, we cannot recalculate the socket address in kernelspace after running the hook by calculating the length of the unix socket path usingstrlen().These hooks can be used when users want to multiplex syscall to a single unix socket to multiple different processes behind the scenes by redirecting the
connect()and other syscalls to process specific sockets.We do not implement support for intercepting
bind()because when usingbind()with unix sockets with a pathname address, this creates an inode in the filesystem which must be cleaned up. If we rewrite the address, the user might try to clean up the wrong file, leaking the socket in the filesystem where it is never cleaned up. Until we figure out a solution for this (and a use case for interceptingbind()), we opt to not allow rewriting the sockaddr inbind()calls.
Quoted 6 lines
We also implement
recvmsg()support for connected streams so that after aconnect()that is modified by a sockaddr hook, any correspondingrecmvsg()on the connected socket can also be modified to make the connected program think it is connected to the "intended" remote.Signed-off-by Daan De Meyer <[email protected]>
PATCH v9 5/9 libbpf: Add support for cgroup unix socket address hooks
In reply to Daan De MeyerAdd the necessary plumbing to hook up the new cgroup unix sockaddr hooks into libbpf.
--- tools/lib/bpf/libbpf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/lib/bpf/libbpf.c +10 -0
@@ -82,17 +82,22 @@ static const char * const attach_type_name[] = { [BPF_CGROUP_INET6_BIND] = "cgroup_inet6_bind", [BPF_CGROUP_INET4_CONNECT] = "cgroup_inet4_connect", [BPF_CGROUP_INET6_CONNECT] = "cgroup_inet6_connect", + [BPF_CGROUP_UNIX_CONNECT] = "cgroup_unix_connect", [BPF_CGROUP_INET4_POST_BIND] = "cgroup_inet4_post_bind", [BPF_CGROUP_INET6_POST_BIND] = "cgroup_inet6_post_bind", [BPF_CGROUP_INET4_GETPEERNAME] = "cgroup_inet4_getpeername", [BPF_CGROUP_INET6_GETPEERNAME] = "cgroup_inet6_getpeername", + [BPF_CGROUP_UNIX_GETPEERNAME] = "cgroup_unix_getpeername", [BPF_CGROUP_INET4_GETSOCKNAME] = "cgroup_inet4_getsockname", [BPF_CGROUP_INET6_GETSOCKNAME] = "cgroup_inet6_getsockname", + [BPF_CGROUP_UNIX_GETSOCKNAME] = "cgroup_unix_getsockname", [BPF_CGROUP_UDP4_SENDMSG] = "cgroup_udp4_sendmsg", [BPF_CGROUP_UDP6_SENDMSG] = "cgroup_udp6_sendmsg", + [BPF_CGROUP_UNIX_SENDMSG] = "cgroup_unix_sendmsg", [BPF_CGROUP_SYSCTL] = "cgroup_sysctl", [BPF_CGROUP_UDP4_RECVMSG] = "cgroup_udp4_recvmsg", [BPF_CGROUP_UDP6_RECVMSG] = "cgroup_udp6_recvmsg", + [BPF_CGROUP_UNIX_RECVMSG] = "cgroup_unix_recvmsg", [BPF_CGROUP_GETSOCKOPT] = "cgroup_getsockopt", [BPF_CGROUP_SETSOCKOPT] = "cgroup_setsockopt", [BPF_SK_SKB_STREAM_PARSER] = "sk_skb_stream_parser",
@@ -8960,14 +8965,19 @@ static const struct bpf_sec_def section_defs[] = {SEC_DEF ("cgroup/bind6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_BIND ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/connect4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_CONNECT ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/connect6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_CONNECT ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/connect_unix" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UNIX_CONNECT ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/sendmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_SENDMSG ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/sendmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_SENDMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/sendmsg_unix" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UNIX_SENDMSG ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/recvmsg4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP4_RECVMSG ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/recvmsg6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UDP6_RECVMSG ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/recvmsg_unix" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UNIX_RECVMSG ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/getpeername4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETPEERNAME ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/getpeername6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETPEERNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getpeername_unix" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UNIX_GETPEERNAME ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/getsockname4" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET4_GETSOCKNAME ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/getsockname6" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_INET6_GETSOCKNAME ,SEC_ATTACHABLE ), +SEC_DEF ("cgroup/getsockname_unix" ,CGROUP_SOCK_ADDR ,BPF_CGROUP_UNIX_GETSOCKNAME ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/sysctl" ,CGROUP_SYSCTL ,BPF_CGROUP_SYSCTL ,SEC_ATTACHABLE ),SEC_DEF ("cgroup/getsockopt" ,CGROUP_SOCKOPT ,BPF_CGROUP_GETSOCKOPT ,SEC_ATTACHABLE ), SEC_DEF("cgroup/setsockopt", CGROUP_SOCKOPT, BPF_CGROUP_SETSOCKOPT, SEC_ATTACHABLE),
Signature · 1 line
2.41.0
PATCH v9 6/9 bpftool: Add support for cgroup unix socket address hooks
In reply to Daan De MeyerAdd the necessary plumbing to hook up the new cgroup unix sockaddr hooks into bpftool.
--- .../bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +++++++++++++--- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 8 +++++--- tools/bpf/bpftool/bash-completion/bpftool | 14 +++++++------- tools/bpf/bpftool/cgroup.c | 16 +++++++++------- tools/bpf/bpftool/prog.c | 7 ++++--- 5 files changed, 38 insertions(+), 23 deletions(-)
tools/bpf/bpftool/Documentation/bpftool-cgroup.rst +13 -3
@@ -36,11 +36,14 @@ CGROUP COMMANDS | **cgroup_device** | **cgroup_inet4_bind** | **cgroup_inet6_bind** | | **cgroup_inet4_post_bind** | **cgroup_inet6_post_bind** | | **cgroup_inet4_connect** | **cgroup_inet6_connect** | -| **cgroup_inet4_getpeername** | **cgroup_inet6_getpeername** | +| **cgroup_unix_connect** | **cgroup_inet4_getpeername** | +| **cgroup_inet6_getpeername** | **cgroup_unix_getpeername** | | **cgroup_inet4_getsockname** | **cgroup_inet6_getsockname** | -| **cgroup_udp4_sendmsg** | **cgroup_udp6_sendmsg** | +| **cgroup_unix_getsockname** | **cgroup_udp4_sendmsg** | +| **cgroup_udp6_sendmsg** | **cgroup_unix_sendmsg** | | **cgroup_udp4_recvmsg** | **cgroup_udp6_recvmsg** | -| **cgroup_sysctl** | **cgroup_getsockopt** | **cgroup_setsockopt** | +| **cgroup_unix_recvmsg** | **cgroup_sysctl** | +| **cgroup_getsockopt** | **cgroup_setsockopt** | | **cgroup_inet_sock_release** } | *ATTACH_FLAGS* := { **multi** | **override** }
@@ -102,21 +105,28 @@ DESCRIPTION **post_bind6** return from bind(2) for an inet6 socket (since 4.17); **connect4** call to connect(2) for an inet4 socket (since 4.17); **connect6** call to connect(2) for an inet6 socket (since 4.17); + **connect_unix** call to connect(2) for a unix socket (since 6.7); **sendmsg4** call to sendto(2), sendmsg(2), sendmmsg(2) for an unconnected udp4 socket (since 4.18); **sendmsg6** call to sendto(2), sendmsg(2), sendmmsg(2) for an unconnected udp6 socket (since 4.18); + **sendmsg_unix** call to sendto(2), sendmsg(2), sendmmsg(2) for + an unconnected unix socket (since 6.7); **recvmsg4** call to recvfrom(2), recvmsg(2), recvmmsg(2) for an unconnected udp4 socket (since 5.2); **recvmsg6** call to recvfrom(2), recvmsg(2), recvmmsg(2) for an unconnected udp6 socket (since 5.2); + **recvmsg_unix** call to recvfrom(2), recvmsg(2), recvmmsg(2) for + an unconnected unix socket (since 6.7); **sysctl** sysctl access (since 5.2); **getsockopt** call to getsockopt (since 5.3); **setsockopt** call to setsockopt (since 5.3); **getpeername4** call to getpeername(2) for an inet4 socket (since 5.8); **getpeername6** call to getpeername(2) for an inet6 socket (since 5.8); + **getpeername_unix** call to getpeername(2) for a unix socket (since 6.7); **getsockname4** call to getsockname(2) for an inet4 socket (since 5.8); **getsockname6** call to getsockname(2) for an inet6 socket (since 5.8). + **getsockname_unix** call to getsockname(2) for a unix socket (since 6.7); **sock_release** closing an userspace inet socket (since 5.9). **bpftool cgroup detach** *CGROUP* *ATTACH_TYPE* *PROG*
tools/bpf/bpftool/Documentation/bpftool-prog.rst +5 -3
@@ -47,9 +47,11 @@ PROG COMMANDS | **cgroup/sock** | **cgroup/dev** | **lwt_in** | **lwt_out** | **lwt_xmit** | | **lwt_seg6local** | **sockops** | **sk_skb** | **sk_msg** | **lirc_mode2** | | **cgroup/bind4** | **cgroup/bind6** | **cgroup/post_bind4** | **cgroup/post_bind6** | -| **cgroup/connect4** | **cgroup/connect6** | **cgroup/getpeername4** | **cgroup/getpeername6** | -| **cgroup/getsockname4** | **cgroup/getsockname6** | **cgroup/sendmsg4** | **cgroup/sendmsg6** | -| **cgroup/recvmsg4** | **cgroup/recvmsg6** | **cgroup/sysctl** | +| **cgroup/connect4** | **cgroup/connect6** | **cgroup/connect_unix** | +| **cgroup/getpeername4** | **cgroup/getpeername6** | **cgroup/getpeername_unix** | +| **cgroup/getsockname4** | **cgroup/getsockname6** | **cgroup/getsockname_unix** | +| **cgroup/sendmsg4** | **cgroup/sendmsg6** | **cgroup/sendmsg_unix** | +| **cgroup/recvmsg4** | **cgroup/recvmsg6** | **cgroup/recvmsg_unix** | **cgroup/sysctl** | | **cgroup/getsockopt** | **cgroup/setsockopt** | **cgroup/sock_release** | | **struct_ops** | **fentry** | **fexit** | **freplace** | **sk_lookup** | }
tools/bpf/bpftool/bash-completion/bpftool +7 -7
@@ -480,13 +480,13 @@ _bpftool() action tracepoint raw_tracepoint \ xdp perf_event cgroup/skb cgroup/sock \ cgroup/dev lwt_in lwt_out lwt_xmit \ - lwt_seg6local sockops sk_skb sk_msg \ - lirc_mode2 cgroup/bind4 cgroup/bind6 \ - cgroup/connect4 cgroup/connect6 \ - cgroup/getpeername4 cgroup/getpeername6 \ - cgroup/getsockname4 cgroup/getsockname6 \ - cgroup/sendmsg4 cgroup/sendmsg6 \ - cgroup/recvmsg4 cgroup/recvmsg6 \ + lwt_seg6local sockops sk_skb sk_msg lirc_mode2 \ + cgroup/bind4 cgroup/bind6 \ + cgroup/connect4 cgroup/connect6 cgroup/connect_unix \ + cgroup/getpeername4 cgroup/getpeername6 cgroup/getpeername_unix \ + cgroup/getsockname4 cgroup/getsockname6 cgroup/getsockname_unix \ + cgroup/sendmsg4 cgroup/sendmsg6 cgroup/sendmsg_unix \ + cgroup/recvmsg4 cgroup/recvmsg6 cgroup/recvmsg_unix \ cgroup/post_bind4 cgroup/post_bind6 \ cgroup/sysctl cgroup/getsockopt \ cgroup/setsockopt cgroup/sock_release struct_ops \
tools/bpf/bpftool/cgroup.c +9 -7
@@ -28,13 +28,15 @@" cgroup_device | cgroup_inet4_bind |\n" \" cgroup_inet6_bind | cgroup_inet4_post_bind |\n" \" cgroup_inet6_post_bind | cgroup_inet4_connect |\n" \ -" cgroup_inet6_connect | cgroup_inet4_getpeername |\n" \ -" cgroup_inet6_getpeername | cgroup_inet4_getsockname |\n" \ -" cgroup_inet6_getsockname | cgroup_udp4_sendmsg |\n" \ -" cgroup_udp6_sendmsg | cgroup_udp4_recvmsg |\n" \ -" cgroup_udp6_recvmsg | cgroup_sysctl |\n" \ -" cgroup_getsockopt | cgroup_setsockopt |\n" \ -" cgroup_inet_sock_release }" +" cgroup_inet6_connect | cgroup_unix_connect |\n" \ +" cgroup_inet4_getpeername | cgroup_inet6_getpeername |\n" \ +" cgroup_unix_getpeername | cgroup_inet4_getsockname |\n" \ +" cgroup_inet6_getsockname | cgroup_unix_getsockname |\n" \ +" cgroup_udp4_sendmsg | cgroup_udp6_sendmsg |\n" \ +" cgroup_unix_sendmsg | cgroup_udp4_recvmsg |\n" \ +" cgroup_udp6_recvmsg | cgroup_unix_recvmsg |\n" \ +" cgroup_sysctl | cgroup_getsockopt |\n" \ +" cgroup_setsockopt | cgroup_inet_sock_release }" static unsigned int query_flags;static struct btf *btf_vmlinux;
tools/bpf/bpftool/prog.c +4 -3
@@ -2475,9 +2475,10 @@ static int do_help(int argc, char **argv)" sk_reuseport | flow_dissector | cgroup/sysctl |\n" " cgroup/bind4 | cgroup/bind6 | cgroup/post_bind4 |\n" " cgroup/post_bind6 | cgroup/connect4 | cgroup/connect6 |\n" -" cgroup/getpeername4 | cgroup/getpeername6 |\n" -" cgroup/getsockname4 | cgroup/getsockname6 | cgroup/sendmsg4 |\n" -" cgroup/sendmsg6 | cgroup/recvmsg4 | cgroup/recvmsg6 |\n" +" cgroup/connect_unix | cgroup/getpeername4 | cgroup/getpeername6 |\n" +" cgroup/getpeername_unix | cgroup/getsockname4 | cgroup/getsockname6 |\n" +" cgroup/getsockname_unix | cgroup/sendmsg4 | cgroup/sendmsg6 |\n" +" cgroup/sendmsg°unix | cgroup/recvmsg4 | cgroup/recvmsg6 | cgroup/recvmsg_unix |\n" " cgroup/getsockopt | cgroup/setsockopt | cgroup/sock_release |\n" " struct_ops | fentry | fexit | freplace | sk_lookup }\n" " ATTACH_TYPE := { sk_msg_verdict | sk_skb_verdict | sk_skb_stream_verdict |\n"
Signature · 1 line
2.41.0
PATCH v9 7/9 documentation/bpf: Document cgroup unix socket address hooks
In reply to Daan De MeyerUpdate the documentation to mention the new cgroup unix sockaddr hooks.
--- Documentation/bpf/libbpf/program_types.rst | 10 ++++++++++ 1 file changed, 10 insertions(+)
Documentation/bpf/libbpf/program_types.rst +10 -0
@@ -56,6 +56,16 @@ described in more detail in the footnotes. | | ``BPF_CGROUP_UDP6_RECVMSG`` | ``cgroup/recvmsg6`` | | + +----------------------------------------+----------------------------------+-----------+ | | ``BPF_CGROUP_UDP6_SENDMSG`` | ``cgroup/sendmsg6`` | | +| +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_CGROUP_UNIX_CONNECT`` | ``cgroup/connect_unix`` | | +| +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_CGROUP_UNIX_SENDMSG`` | ``cgroup/sendmsg_unix`` | | +| +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_CGROUP_UNIX_RECVMSG`` | ``cgroup/recvmsg_unix`` | | +| +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_CGROUP_UNIX_GETPEERNAME`` | ``cgroup/getpeername_unix`` | | +| +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_CGROUP_UNIX_GETSOCKNAME`` | ``cgroup/getsockname_unix`` | | +-------------------------------------------+----------------------------------------+----------------------------------+-----------+ | ``BPF_PROG_TYPE_CGROUP_SOCK`` | ``BPF_CGROUP_INET4_POST_BIND`` | ``cgroup/post_bind4`` | | + +----------------------------------------+----------------------------------+-----------+
Signature · 1 line
2.41.0
PATCH v9 8/9 selftests/bpf: Make sure mount directory exists
In reply to Daan De MeyerThe mount directory for the selftests cgroup tree might not exist so let's make sure it does exist by creating it ourselves if it doesn't exist.
--- tools/testing/selftests/bpf/cgroup_helpers.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/testing/selftests/bpf/cgroup_helpers.c +5 -0
@@ -199,6 +199,11 @@ int setup_cgroup_environment(void)format_cgroup_path (cgroup_workdir,"" ); +if (mkdir (CGROUP_MOUNT_PATH ,0777 ) && errno !=EEXIST ) { +log_err ("mkdir mount" ); +return 1 ; + } +if (unshare (CLONE_NEWNS )) {log_err ("unshare" );return 1 ;
Signature · 1 line
2.41.0
PATCH v9 9/9 selftests/bpf: Add tests for cgroup unix socket address hooks
In reply to Daan De MeyerThese selftests are written in prog_tests style instead of adding them to the existing test_sock_addr tests. Migrating the existing sock addr tests to prog_tests style is left for future work. This commit adds support for testing bind() sockaddr hooks, even though there's no unix socket sockaddr hook for bind(). We leave this code intact for when the INET and INET6 tests are migrated in the future which do support intercepting bind().
--- tools/testing/selftests/bpf/bpf_kfuncs.h | 14 + tools/testing/selftests/bpf/network_helpers.c | 34 + tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/section_names.c | 25 + .../selftests/bpf/prog_tests/sock_addr.c | 612 ++++++++++++++++++ .../selftests/bpf/progs/connect_unix_prog.c | 40 ++ .../bpf/progs/getpeername_unix_prog.c | 39 ++ .../bpf/progs/getsockname_unix_prog.c | 39 ++ .../selftests/bpf/progs/recvmsg_unix_prog.c | 39 ++ .../selftests/bpf/progs/sendmsg_unix_prog.c | 40 ++ 10 files changed, 883 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_addr.c create mode 100644 tools/testing/selftests/bpf/progs/connect_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getpeername_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/getsockname_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c create mode 100644 tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c
tools/testing/selftests/bpf/bpf_kfuncs.h +14 -0
@@ -1,6 +1,8 @@#ifndef __BPF_KFUNCS__#define __BPF_KFUNCS__ +struct bpf_sock_addr_kern ; +/* Description * Initializes an skb-type dynptr * Returns
@@ -41,4 +43,16 @@ extern bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *ptr) __ksym; extern __u32 bpf_dynptr_size(const struct bpf_dynptr *ptr) __ksym; extern int bpf_dynptr_clone(const struct bpf_dynptr *ptr, struct bpf_dynptr *clone__init) __ksym; +/* Description +* Modify the address of a AF_UNIX sockaddr. +* Returns__bpf_kfunc +* -EINVAL if the address size is too big or, 0 if the sockaddr was successfully modified. +*/ +extern int bpf_sock_addr_set_unix_addr(struct bpf_sock_addr_kern *sa_kern, + const __u8 *addr, __u32 addrlen__sz) __ksym; + +void *bpf_cast_to_kern_ctx (void *) __ksym; + +void *bpf_rdonly_cast (void *obj,__u32 btf_id) __ksym; +#endif
tools/testing/selftests/bpf/network_helpers.c +34 -0
@@ -11,6 +11,7 @@#include <arpa/inet.h> #include <sys/mount.h> #include <sys/stat.h> +#include <sys/un.h> #include <linux/err.h> #include <linux/in.h>
@@ -257,6 +258,26 @@ static int connect_fd_to_addr(int fd,return 0 ; } +int connect_to_addr (const struct sockaddr_storage *addr,socklen_t addrlen,int type) +{ +int fd; + + fd =socket (addr->ss_family, type,0 ); +if (fd <0 ) { +log_err ("Failed to create client socket" ); +return -1 ; + } + +if (connect_fd_to_addr (fd, addr, addrlen, false)) + goto error_close; + +return fd; + +error_close: +save_errno_close (fd); +return -1 ; +} +static const struct network_helper_opts default_opts;int connect_to_fd_opts (int server_fd,const struct network_helper_opts *opts)
@@ -380,6 +401,19 @@ int make_sockaddr(int family, const char *addr_str, __u16 port,if (len) *len =sizeof (*sin6);return 0 ; + }else if (family ==AF_UNIX ) { +/* Note that we always use abstract unix sockets to avoid having +* to clean up leftover files. +*/ +struct sockaddr_un *sun = (void *)addr; + +memset (addr,0 ,sizeof (*sun)); + sun->sun_family = family; + sun->sun_path[0 ] =0 ; +strcpy (sun->sun_path +1 , addr_str); +if (len) + *len = offsetof(struct sockaddr_un , sun_path) +1 +strlen (addr_str); +return 0 ; }return -1 ; }
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -51,6 +51,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str, __u16 port, int timeout_ms, unsigned int nr_listens);void free_fds (int *fds,unsigned int nr_close_fds); +int connect_to_addr (const struct sockaddr_storage *addr,socklen_t len,int type);int connect_to_fd (int server_fd,int timeout_ms);int connect_to_fd_opts (int server_fd,const struct network_helper_opts *opts);int connect_fd_to_fd (int client_fd,int server_fd,int timeout_ms);
tools/testing/selftests/bpf/prog_tests/section_names.c +25 -0
@@ -123,6 +123,11 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_CONNECT}, {0, BPF_CGROUP_INET6_CONNECT}, }, + { +"cgroup/connect_unix" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UNIX_CONNECT}, + {0, BPF_CGROUP_UNIX_CONNECT}, + }, {"cgroup/sendmsg4" , {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UDP4_SENDMSG},
@@ -133,6 +138,11 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UDP6_SENDMSG}, {0, BPF_CGROUP_UDP6_SENDMSG}, }, + { +"cgroup/sendmsg_unix" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UNIX_SENDMSG}, + {0, BPF_CGROUP_UNIX_SENDMSG}, + }, {"cgroup/recvmsg4" , {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UDP4_RECVMSG},
@@ -143,6 +153,11 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UDP6_RECVMSG}, {0, BPF_CGROUP_UDP6_RECVMSG}, }, + { +"cgroup/recvmsg_unix" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UNIX_RECVMSG}, + {0, BPF_CGROUP_UNIX_RECVMSG}, + }, {"cgroup/sysctl" , {0, BPF_PROG_TYPE_CGROUP_SYSCTL, BPF_CGROUP_SYSCTL},
@@ -168,6 +183,11 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_GETPEERNAME}, {0, BPF_CGROUP_INET6_GETPEERNAME}, }, + { +"cgroup/getpeername_unix" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UNIX_GETPEERNAME}, + {0, BPF_CGROUP_UNIX_GETPEERNAME}, + }, {"cgroup/getsockname4" , {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET4_GETSOCKNAME},
@@ -178,6 +198,11 @@ static struct sec_name_test tests[] = { {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_INET6_GETSOCKNAME}, {0, BPF_CGROUP_INET6_GETSOCKNAME}, }, + { +"cgroup/getsockname_unix" , + {0, BPF_PROG_TYPE_CGROUP_SOCK_ADDR, BPF_CGROUP_UNIX_GETSOCKNAME}, + {0, BPF_CGROUP_UNIX_GETSOCKNAME}, + }, };static void test_prog_type_by_name (const struct sec_name_test *test)
tools/testing/selftests/bpf/prog_tests/sock_addr.c new file +612 -0
612 lines not on this page · raw message
tools/testing/selftests/bpf/progs/connect_unix_prog.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +__u8 SERVUN_REWRITE_ADDRESS [] ="\0bpf_cgroup_unix_test_rewrite" ; + +SEC("cgroup/connect_unix") +int connect_unix_prog (struct bpf_sock_addr *ctx) +{ +struct bpf_sock_addr_kern *sa_kern =bpf_cast_to_kern_ctx (ctx); +struct sockaddr_un *sa_kern_unaddr; +__u32 unaddrlen = offsetof(struct sockaddr_un , sun_path) + +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ; +int ret; + +/* Rewrite destination. */ + ret =bpf_sock_addr_set_unix_addr (sa_kern,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ); +if (ret) +return 0 ; + +if (sa_kern->uaddrlen != unaddrlen) +return 0 ; + + sa_kern_unaddr =bpf_rdonly_cast (sa_kern->uaddr, + bpf_core_type_id_kernel(struct sockaddr_un)); +if (memcmp (sa_kern_unaddr->sun_path,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ) !=0 ) +return 0 ; + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/getpeername_unix_prog.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +__u8 SERVUN_REWRITE_ADDRESS [] ="\0bpf_cgroup_unix_test_rewrite" ; + +SEC("cgroup/getpeername_unix") +int getpeername_unix_prog (struct bpf_sock_addr *ctx) +{ +struct bpf_sock_addr_kern *sa_kern =bpf_cast_to_kern_ctx (ctx); +struct sockaddr_un *sa_kern_unaddr; +__u32 unaddrlen = offsetof(struct sockaddr_un , sun_path) + +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ; +int ret; + + ret =bpf_sock_addr_set_unix_addr (sa_kern,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ); +if (ret) +return 1 ; + +if (sa_kern->uaddrlen != unaddrlen) +return 1 ; + + sa_kern_unaddr =bpf_rdonly_cast (sa_kern->uaddr, + bpf_core_type_id_kernel(struct sockaddr_un)); +if (memcmp (sa_kern_unaddr->sun_path,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ) !=0 ) +return 1 ; + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/getsockname_unix_prog.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +__u8 SERVUN_REWRITE_ADDRESS [] ="\0bpf_cgroup_unix_test_rewrite" ; + +SEC("cgroup/getsockname_unix") +int getsockname_unix_prog (struct bpf_sock_addr *ctx) +{ +struct bpf_sock_addr_kern *sa_kern =bpf_cast_to_kern_ctx (ctx); +struct sockaddr_un *sa_kern_unaddr; +__u32 unaddrlen = offsetof(struct sockaddr_un , sun_path) + +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ; +int ret; + + ret =bpf_sock_addr_set_unix_addr (sa_kern,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ); +if (ret) +return 1 ; + +if (sa_kern->uaddrlen != unaddrlen) +return 1 ; + + sa_kern_unaddr =bpf_rdonly_cast (sa_kern->uaddr, + bpf_core_type_id_kernel(struct sockaddr_un)); +if (memcmp (sa_kern_unaddr->sun_path,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ) !=0 ) +return 1 ; + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +__u8 SERVUN_ADDRESS [] ="\0bpf_cgroup_unix_test" ; + +SEC("cgroup/recvmsg_unix") +int recvmsg_unix_prog (struct bpf_sock_addr *ctx) +{ +struct bpf_sock_addr_kern *sa_kern =bpf_cast_to_kern_ctx (ctx); +struct sockaddr_un *sa_kern_unaddr; +__u32 unaddrlen = offsetof(struct sockaddr_un , sun_path) + +sizeof (SERVUN_ADDRESS ) -1 ; +int ret; + + ret =bpf_sock_addr_set_unix_addr (sa_kern,SERVUN_ADDRESS , +sizeof (SERVUN_ADDRESS ) -1 ); +if (ret) +return 1 ; + +if (sa_kern->uaddrlen != unaddrlen) +return 1 ; + + sa_kern_unaddr =bpf_rdonly_cast (sa_kern->uaddr, + bpf_core_type_id_kernel(struct sockaddr_un)); +if (memcmp (sa_kern_unaddr->sun_path,SERVUN_ADDRESS , +sizeof (SERVUN_ADDRESS ) -1 ) !=0 ) +return 1 ; + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ + +#include "vmlinux.h" + +#include <string.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> +#include "bpf_kfuncs.h" + +__u8 SERVUN_REWRITE_ADDRESS [] ="\0bpf_cgroup_unix_test_rewrite" ; + +SEC("cgroup/sendmsg_unix") +int sendmsg_unix_prog (struct bpf_sock_addr *ctx) +{ +struct bpf_sock_addr_kern *sa_kern =bpf_cast_to_kern_ctx (ctx); +struct sockaddr_un *sa_kern_unaddr; +__u32 unaddrlen = offsetof(struct sockaddr_un , sun_path) + +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ; +int ret; + +/* Rewrite destination. */ + ret =bpf_sock_addr_set_unix_addr (sa_kern,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ); +if (ret) +return 0 ; + +if (sa_kern->uaddrlen != unaddrlen) +return 0 ; + + sa_kern_unaddr =bpf_rdonly_cast (sa_kern->uaddr, + bpf_core_type_id_kernel(struct sockaddr_un)); +if (memcmp (sa_kern_unaddr->sun_path,SERVUN_REWRITE_ADDRESS , +sizeof (SERVUN_REWRITE_ADDRESS ) -1 ) !=0 ) +return 0 ; + +return 1 ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.41.0