Re: [PATCH bpf-next v7 1/6] bpf: Use ipv6_only_sock in bpf_tcp_gen_syncookie

Alexei Starovoitov
2022-04-29T03:15:50Z

On Thu, Apr 28, 2022 at 8:38 AM Maxim Mikityanskiy <maximmi@nvidia.com> wrote:
>
> Instead of querying the sk_ipv6only field directly, use the dedicated
> ipv6_only_sock helper.
>
> Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
> Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
> Acked-by: John Fastabend <john.fastabend@gmail.com>
> Acked-by: Lorenz Bauer <lmb@cloudflare.com>
> Acked-by: Petar Penkov <ppenkov@google.com>
> ---
> net/core/filter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 8847316ee20e..207a13db5c80 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -7099,7 +7099,7 @@ BPF_CALL_5(bpf_tcp_gen_syncookie, struct sock *, sk, void *, iph, u32, iph_len,
> */
> switch (((struct iphdr *)iph)->version) {
> case 4:
> - if (sk->sk_family == AF_INET6 && sk->sk_ipv6only)
> + if (sk->sk_family == AF_INET6 && ipv6_only_sock(sk))
> return -EINVAL;

Please rebase patches before resending.

Applying: bpf: Use ipv6_only_sock in bpf_tcp_gen_syncookie
Using index info to reconstruct a base tree...
M net/core/filter.c
Falling back to patching base and 3-way merge...
Auto-merging net/core/filter.c
No changes -- Patch already applied.
Applying: bpf: Fix documentation of th_len in bpf_tcp_{gen,check}_syncookie
Applying: bpf: Allow helpers to accept pointers with a fixed size
Applying: bpf: Add helpers to issue and check SYN cookies in XDP
error: sha1 information is lacking or useless (include/uapi/linux/bpf.h).
error: could not build fake ancestor
Patch failed at 0004 bpf: Add helpers to issue and check SYN cookies in XDP

Also trim your cc. You keep sending to addresses that are bouncing
(Lorenz's and Petar's).

Remove their Ack-s too or fix them with correct emails.