diff options
| author | Jakub Kicinski <[email protected]> | 2022-06-20 19:13:53 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2022-06-23 08:08:30 +0000 |
| commit | e34a07c0ae3906f97eb18df50902e2a01c1015b6 (patch) | |
| tree | e35d546617ccabf2a0fb04953d347b0d8d6dd1aa /net/tls/tls_main.c | |
| parent | Revert "net/tls: fix tls_sk_proto_close executed repeatedly" (diff) | |
| download | kernel-e34a07c0ae3906f97eb18df50902e2a01c1015b6.tar.gz kernel-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 <[email protected]>
Reviewed-by: John Fastabend <[email protected]>
Reviewed-by: Jakub Sitnicki <[email protected]>
Tested-by: Jakub Sitnicki <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'net/tls/tls_main.c')
| -rw-r--r-- | net/tls/tls_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index da176411c1b5..2ffede463e4a 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -921,6 +921,8 @@ static void tls_update(struct sock *sk, struct proto *p, { struct tls_context *ctx; + WARN_ON_ONCE(sk->sk_prot == p); + ctx = tls_get_ctx(sk); if (likely(ctx)) { ctx->sk_write_space = write_space; |