queue-6.6/tls-get-psock-ref-after-taking-rxlock-to-avoid-leak.patch

   1 From a0b38d79a81ceac4d0d7f2b017b921afd4b85782 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 25 Mar 2024 16:56:48 +0100
   4 Subject: tls: get psock ref after taking rxlock to avoid leak
   5
   6 From: Sabrina Dubroca <sd@queasysnail.net>
   7
   8 [ Upstream commit 417e91e856099e9b8a42a2520e2255e6afe024be ]
   9
  10 At the start of tls_sw_recvmsg, we take a reference on the psock, and
  11 then call tls_rx_reader_lock. If that fails, we return directly
  12 without releasing the reference.
  13
  14 Instead of adding a new label, just take the reference after locking
  15 has succeeded, since we don't need it before.
  16
  17 Fixes: 4cbc325ed6b4 ("tls: rx: allow only one reader at a time")
  18 Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
  19 Reviewed-by: Simon Horman <horms@kernel.org>
  20 Link: https://lore.kernel.org/r/fe2ade22d030051ce4c3638704ed58b67d0df643.1711120964.git.sd@queasysnail.net
  21 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  22 Signed-off-by: Sasha Levin <sashal@kernel.org>
  23 ---
  24  net/tls/tls_sw.c | 2 +-
  25  1 file changed, 1 insertion(+), 1 deletion(-)
  26
  27 diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
  28 index 925de4caa894a..df166f6afad82 100644
  29 --- a/net/tls/tls_sw.c
  30 +++ b/net/tls/tls_sw.c
  31 @@ -1976,10 +1976,10 @@ int tls_sw_recvmsg(struct sock *sk,
  32         if (unlikely(flags & MSG_ERRQUEUE))
  33                 return sock_recv_errqueue(sk, msg, len, SOL_IP, IP_RECVERR);
  34
  35 -       psock = sk_psock_get(sk);
  36         err = tls_rx_reader_lock(sk, ctx, flags & MSG_DONTWAIT);
  37         if (err < 0)
  38                 return err;
  39 +       psock = sk_psock_get(sk);
  40         bpf_strp_enabled = sk_psock_strp_enabled(psock);
  41
  42         /* If crypto failed the connection is broken */
  43 --
  44 2.43.0
  45