diff for duplicates of <87a72ivh6t.fsf@cloudflare.com> diff --git a/a/1.txt b/N1/1.txt index a8f8da8..cce3f46 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ On Fri, May 08, 2020 at 09:06 AM CEST, Martin KaFai Lau wrote: >> case BPF_CGROUP_SETSOCKOPT: >> return BPF_PROG_TYPE_CGROUP_SOCKOPT; >> + case BPF_SK_LOOKUP: -> It may be a good idea to enforce the "expected_attach_type == +> It may be a good idea to enforce the "expected_attach_type = > BPF_SK_LOOKUP" during prog load time in bpf_prog_load_check_attach(). > The attr->expected_attach_type could be anything right now if I read > it correctly. @@ -171,7 +171,7 @@ sense to be more specific in the helper proto. >> + if (sk->sk_protocol != ctx->protocol) >> + return -EPROTOTYPE; >> + if (sk->sk_family != ctx->family && ->> + (sk->sk_family == AF_INET || ipv6_only_sock(sk))) +>> + (sk->sk_family = AF_INET || ipv6_only_sock(sk))) >> + return -EAFNOSUPPORT; >> + >> + /* Select socket as lookup result */ diff --git a/a/content_digest b/N1/content_digest index 273ef98..9f3be98 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,8 @@ - "ref\020200506125514.1020829-1-jakub@cloudflare.com\0" "ref\020200506125514.1020829-3-jakub@cloudflare.com\0" - "ref\020200508070638.pqe73q4v3paxpkq5@kafai-mbp.dhcp.thefacebook.com\0" "From\0Jakub Sitnicki <jakub@cloudflare.com>\0" "Subject\0Re: [PATCH bpf-next 02/17] bpf: Introduce SK_LOOKUP program type with a dedicated attach point\0" - "Date\0Fri, 08 May 2020 12:45:14 +0200\0" - "To\0Martin KaFai Lau <kafai@fb.com>\0" - "Cc\0netdev@vger.kernel.org" - bpf@vger.kernel.org - dccp@vger.kernel.org - kernel-team@cloudflare.com - Alexei Starovoitov <ast@kernel.org> - Daniel Borkmann <daniel@iogearbox.net> - David S. Miller <davem@davemloft.net> - Eric Dumazet <edumazet@google.com> - Gerrit Renker <gerrit@erg.abdn.ac.uk> - Jakub Kicinski <kuba@kernel.org> - Marek Majkowski <marek@cloudflare.com> - " Lorenz Bauer <lmb@cloudflare.com>\0" + "Date\0Fri, 08 May 2020 10:45:14 +0000\0" + "To\0dccp@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, May 08, 2020 at 09:06 AM CEST, Martin KaFai Lau wrote:\n" @@ -67,7 +53,7 @@ ">> \tcase BPF_CGROUP_SETSOCKOPT:\n" ">> \t\treturn BPF_PROG_TYPE_CGROUP_SOCKOPT;\n" ">> +\tcase BPF_SK_LOOKUP:\n" - "> It may be a good idea to enforce the \"expected_attach_type ==\n" + "> It may be a good idea to enforce the \"expected_attach_type =\n" "> BPF_SK_LOOKUP\" during prog load time in bpf_prog_load_check_attach().\n" "> The attr->expected_attach_type could be anything right now if I read\n" "> it correctly.\n" @@ -192,7 +178,7 @@ ">> +\tif (sk->sk_protocol != ctx->protocol)\n" ">> +\t\treturn -EPROTOTYPE;\n" ">> +\tif (sk->sk_family != ctx->family &&\n" - ">> +\t (sk->sk_family == AF_INET || ipv6_only_sock(sk)))\n" + ">> +\t (sk->sk_family = AF_INET || ipv6_only_sock(sk)))\n" ">> +\t\treturn -EAFNOSUPPORT;\n" ">> +\n" ">> +\t/* Select socket as lookup result */\n" @@ -210,4 +196,4 @@ "\n" Thank you for valuable comments. Will fix all of the above in v2. -f8f904de46c44444a8db6ecb4278c03b8626152499c8887f7f29bd596590299c +f05bae2ca66414f0999c283525eb9d124db167b5d565f9d7a6d4cceac33f374f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.