Commit 3ea6190b authored Apr 20, 2022 by Francesco Ruggeri Committed by Greg Kroah-Hartman May 09, 2022

tcp: md5: incorrect tcp_header_len for incoming connections



[ Upstream commit 5b0b9e4c2c895227c8852488b3f09839233bba54 ]

In tcp_create_openreq_child we adjust tcp_header_len for md5 using the
remote address in newsk. But that address is still 0 in newsk at this
point, and it is only set later by the callers (tcp_v[46]_syn_recv_sock).
Use the address from the request socket instead.

Fixes: cfb6eeb4 ("[TCP]: MD5 Signature Option (RFC2385) support.")
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20220421005026.686A45EC01F2@us226.sjc.aristanetworks.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2b9a13d9

net/ipv4/tcp_minisocks.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -538,7 +538,7 @@ struct sock tcp_create_openreq_child(const struct sock sk,
	newtp->tsoffset = treq->ts_off;		newtp->tsoffset = treq->ts_off;
	#ifdef CONFIG_TCP_MD5SIG		#ifdef CONFIG_TCP_MD5SIG
	newtp->md5sig_info = NULL; /XXX/		newtp->md5sig_info = NULL; /XXX/
	if (newtp->af_specific->md5_lookup(sk, newsk))		if (treq->af_specific->req_md5_lookup(sk, req_to_sk(req)))
	newtp->tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;		newtp->tcp_header_len += TCPOLEN_MD5SIG_ALIGNED;
	#endif		#endif
	if (skb->len >= TCP_MSS_DEFAULT + newtp->tcp_header_len)		if (skb->len >= TCP_MSS_DEFAULT + newtp->tcp_header_len)