From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A05B84D03; Mon, 8 Apr 2024 13:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581850; cv=none; b=IwuvUPJKirwej5CEkHZyts9dgNoob3TZjCa+aXBlpnf/Uv10gRNkOnz5u+l/pcc29JS0vA6RygFKhDN+3+j0dszL3fUqQ/4PbDBjDtYkHuZjmNHWMwnOTaNpXe6DPjDx6v8BTdaxVoHSlOMzRTiUqNKIPyy6MiTSa+cMO03HCc4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712581850; c=relaxed/simple; bh=p1uNTQT6UPwmAHYzicBYzeC6DJIx9bSfW3BgnCeOxCk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ey70TbiD/+oHlCh8a+UQYcjat1ifQ8Rw/AayZ3o8DoNzQYj0vNRMImQV0tTA6VDJe5jJTrRNdj48wpkdqPNs1Nia5xgwanDe0CRCMQHhmpqiS7MKGYO98Jw6A6ikQ0gOGdaRz9/xGo9RVZ96g2K4jZ2D/DqPjjdqkxSIk5+tFk4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iyfn9nKJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iyfn9nKJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65CB7C43330; Mon, 8 Apr 2024 13:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712581849; bh=p1uNTQT6UPwmAHYzicBYzeC6DJIx9bSfW3BgnCeOxCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iyfn9nKJjZXS6yj9/oPM8BK86V++JO8yYRfo8AGNzGO8EZK9vQt7ak3Ay24V5vUYh 72+8V/dCvBVppbgQl6ninsKkavzFUmdh9/wqgxjabUyiS+93tUJffX/scP2JYu8JdM FrDwpgACF/GDWYeDlYfpj7EUrveoNueIqUUJVAuY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sabrina Dubroca , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 031/252] tls: get psock ref after taking rxlock to avoid leak Date: Mon, 8 Apr 2024 14:55:30 +0200 Message-ID: <20240408125307.612069168@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sabrina Dubroca [ Upstream commit 417e91e856099e9b8a42a2520e2255e6afe024be ] At the start of tls_sw_recvmsg, we take a reference on the psock, and then call tls_rx_reader_lock. If that fails, we return directly without releasing the reference. Instead of adding a new label, just take the reference after locking has succeeded, since we don't need it before. Fixes: 4cbc325ed6b4 ("tls: rx: allow only one reader at a time") Signed-off-by: Sabrina Dubroca Reviewed-by: Simon Horman Link: https://lore.kernel.org/r/fe2ade22d030051ce4c3638704ed58b67d0df643.1711120964.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/tls/tls_sw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 925de4caa894a..df166f6afad82 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1976,10 +1976,10 @@ int tls_sw_recvmsg(struct sock *sk, if (unlikely(flags & MSG_ERRQUEUE)) return sock_recv_errqueue(sk, msg, len, SOL_IP, IP_RECVERR); - psock = sk_psock_get(sk); err = tls_rx_reader_lock(sk, ctx, flags & MSG_DONTWAIT); if (err < 0) return err; + psock = sk_psock_get(sk); bpf_strp_enabled = sk_psock_strp_enabled(psock); /* If crypto failed the connection is broken */ -- 2.43.0