diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-05-19 11:32:04 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-05-19 11:35:14 -0700 |
| commit | 0e5633acc59573994d9aca02ad1b2f3a3de44181 (patch) | |
| tree | 55fe5f6a92563b0db505cfa422e2d2033ecdd283 /include/linux | |
| parent | d800bad67d4c21aaf11722f04e0f7547fb915ab5 (diff) | |
| parent | 566fc3f5d1c641b510ec487cf274a047f8a1e849 (diff) | |
Merge branch 'getpeername'
Daniel Borkmann says:
====================
Trivial patch to add get{peer,sock}name cgroup attach types to the BPF
sock_addr programs in order to enable rewriting sockaddr structs from
both calls along with libbpf and bpftool support as well as selftests.
Thanks!
v1 -> v2:
- use __u16 for ports in start_server_with_port() signature and in
expected_{local,peer} ports in the test case (Andrey)
- Added both Andrii's and Andrey's ACKs
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bpf-cgroup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 272626cc3fc9..c66c545e161a 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -396,6 +396,7 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, } #define cgroup_bpf_enabled (0) +#define BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, type, t_ctx) ({ 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; }) |