| Message ID | 604fa24e63524f9e0f5098df7e1a578debf471bf.1666825799.git.asml.silence@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e276d62dcfdee6582486e8b8344dd869518e14be |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | a few corrections for SOCK_SUPPORT_ZC | expand |
diff --git a/net/ipv4/tcp_ulp.c b/net/ipv4/tcp_ulp.c index 7c27aa629af1..9ae50b1bd844 100644 --- a/net/ipv4/tcp_ulp.c +++ b/net/ipv4/tcp_ulp.c @@ -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;
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: Jakub Kicinski <kuba@kernel.org> Fixes: e993ffe3da4bc ("net: flag sockets supporting msghdr originated zerocopy") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> --- net/ipv4/tcp_ulp.c | 3 +++ 1 file changed, 3 insertions(+)