Commit c058bbf0 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Don't set treq->req_usec_ts in cookie_tcp_reqsk_init(). 



Commit de5626b9 ("tcp: Factorise cookie-independent fields
initialisation in cookie_v[46]_check().") miscategorised
tcp_rsk(req)->req_usec_ts init to cookie_tcp_reqsk_init(),
which is used by both BPF/non-BPF SYN cookie reqsk.

Rather, it should have been moved to cookie_tcp_reqsk_alloc() by
commit 8e7bab6b ("tcp: Factorise cookie-dependent fields
initialisation in cookie_v[46]_check()") so that only non-BPF SYN
cookie sets tcp_rsk(req)->req_usec_ts to false.

Let's move the initialisation to cookie_tcp_reqsk_alloc() to
respect bpf_tcp_req_attrs.usec_ts_ok.

Fixes: e472f888 ("bpf: tcp: Support arbitrary SYN Cookie.")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260410235328.1773449-1-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2258d1df

net/ipv4/syncookies.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ static int cookie_tcp_reqsk_init(struct sock *sk, struct sk_buff *skb, 
	treq->rcv_isn = ntohl(th->seq) - 1;

	treq->snt_isn = ntohl(th->ack_seq) - 1;

	treq->syn_tos = TCP_SKB_CB(skb)->ip_dsfield;

	treq->req_usec_ts = false;



#if IS_ENABLED(CONFIG_MPTCP)

	treq->is_mptcp = sk_is_mptcp(sk);
@@ -349,6 +348,7 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops, 
	ireq->wscale_ok = tcp_opt->wscale_ok;

	ireq->ecn_ok = !!(tcp_opt->rcv_tsecr & TS_OPT_ECN);



	treq->req_usec_ts = false;

	treq->ts_off = tsoff;



	return req;