diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-06-20 12:13:53 -0700 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2022-06-23 10:08:30 +0200 |
| commit | e34a07c0ae3906f97eb18df50902e2a01c1015b6 (patch) | |
| tree | e35d546617ccabf2a0fb04953d347b0d8d6dd1aa /include/net/inet_sock.h | |
| parent | Revert "net/tls: fix tls_sk_proto_close executed repeatedly" (diff) | |
| download | wireguard-linux-e34a07c0ae3906f97eb18df50902e2a01c1015b6.tar.xz wireguard-linux-e34a07c0ae3906f97eb18df50902e2a01c1015b6.zip | |
sock: redo the psock vs ULP protection check
Commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
has moved the inet_csk_has_ulp(sk) check from sk_psock_init() to
the new tcp_bpf_update_proto() function. I'm guessing that this
was done to allow creating psocks for non-inet sockets.
Unfortunately the destruction path for psock includes the ULP
unwind, so we need to fail the sk_psock_init() itself.
Otherwise if ULP is already present we'll notice that later,
and call tcp_update_ulp() with the sk_proto of the ULP
itself, which will most likely result in the ULP looping
its callbacks.
Fixes: 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: John Fastabend <john.fastabend@gmail.com>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/r/20220620191353.1184629-2-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index c1b5dcd6597c..daead5fb389a 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -253,6 +253,11 @@ struct inet_sock { #define IP_CMSG_CHECKSUM BIT(7) #define IP_CMSG_RECVFRAGSIZE BIT(8) +static inline bool sk_is_inet(struct sock *sk) +{ + return sk->sk_family == AF_INET || sk->sk_family == AF_INET6; +} + /** * sk_to_full_sk - Access to a full socket * @sk: pointer to a socket |