Commit 6db8b963 authored Apr 02, 2016 by Soheil Hassas Yeganeh Committed by David S. Miller Apr 04, 2016

tcp: accept SOF_TIMESTAMPING_OPT_ID for passive TFO



SOF_TIMESTAMPING_OPT_ID is set to get data-independent IDs
to associate timestamps with send calls. For TCP connections,
tp->snd_una is used as the starting point to calculate
relative IDs.

This socket option will fail if set before the handshake on a
passive TCP fast open connection with data in SYN or SYN/ACK,
since setsockopt requires the connection to be in the
ESTABLISHED state.

To address these, instead of limiting the option to the
ESTABLISHED state, accept the SOF_TIMESTAMPING_OPT_ID option as
long as the connection is not in LISTEN or CLOSE states.

Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 39771b12

net/core/sock.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -832,7 +832,8 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
		!(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {
		if (sk->sk_protocol == IPPROTO_TCP &&
		sk->sk_type == SOCK_STREAM) {
		if (sk->sk_state != TCP_ESTABLISHED) {
		if ((1 << sk->sk_state) &
		(TCPF_CLOSE \| TCPF_LISTEN)) {
		ret = -EINVAL;
		break;
		}