Commit e276d62d authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski
Browse files

net/ulp: remove SOCK_SUPPORT_ZC from tls sockets 



Remove SOCK_SUPPORT_ZC when we're setting ulp as it might not support
msghdr::ubuf_info, e.g. like TLS replacing ->sk_prot with a new set of
handlers.

Cc: <stable@vger.kernel.org> # 6.0
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Fixes: e993ffe3 ("net: flag sockets supporting msghdr originated zerocopy")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fee9ac06

net/ipv4/tcp_ulp.c

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ static int __tcp_set_ulp(struct sock *sk, const struct tcp_ulp_ops *ulp_ops) 
	if (icsk->icsk_ulp_ops)

		goto out_err;



	if (sk->sk_socket)

		clear_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);



	err = ulp_ops->init(sk);

	if (err)

		goto out_err;