From: Jakub Kicinski <kuba@kernel.org>
To: Quanye Yang via B4 Relay <devnull+quanyeyang.proton.me@kernel.org>
Cc: quanyeyang@proton.me, John Fastabend <john.fastabend@gmail.com>,
Sabrina Dubroca <sd@queasysnail.net>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Jakub Sitnicki <jakub@cloudflare.com>,
Jiayuan Chen <jiayuan.chen@linux.dev>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org
Subject: Re: [PATCH net-next v4 1/2] tls: annotate lockless access to sk->sk_err
Date: Tue, 20 Oct 2026 14:23:42 -0700 [thread overview]
Message-ID: <20261020142342.4d9ef62c@kernel.org> (raw)
In-Reply-To: <20261015-tls-fix-sk-kcsan-err-v4-1-391d788327f3@proton.me>
On Thu, 15 Oct 2026 20:31:36 -0700 Quanye Yang via B4 Relay wrote:
> struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
> DEFINE_WAIT_FUNC(wait, woken_wake_function);
> int ret = 0;
> + int skerr;
> long timeo;
reverse xmas tree
> /* a rekey is pending, let userspace deal with it */
> @@ -1107,10 +1114,14 @@ tls_rx_rec_wait(struct sock *sk, bool nonblock, bool released, bool has_copied)
> timeo = sock_rcvtimeo(sk, nonblock);
>
> while (!tls_strp_msg_ready(ctx)) {
> - if (sk->sk_err) {
> - if (has_copied)
> - return -READ_ONCE(sk->sk_err);
> - return sock_error(sk);
> + if (has_copied) {
> + skerr = READ_ONCE(sk->sk_err);
> + if (skerr)
> + return -skerr;
> + } else {
> + skerr = sock_error(sk);
> + if (skerr)
> + return skerr;
> }
>
> if (ret < 0)
> @@ -1132,10 +1143,14 @@ tls_rx_rec_wait(struct sock *sk, bool nonblock, bool released, bool has_copied)
> * sk_err here so a connection abort surfaces as the
> * actual error rather than a clean EOF.
> */
> - if (sk->sk_err) {
> - if (has_copied)
> - return -READ_ONCE(sk->sk_err);
> - return sock_error(sk);
> + if (has_copied) {
> + skerr = READ_ONCE(sk->sk_err);
> + if (skerr)
> + return -skerr;
> + } else {
> + skerr = sock_error(sk);
> + if (skerr)
> + return skerr;
duplicating this now longish check twice in the same function is ugly
this needs to be refactored somehow
--
pw-bot: cr
next prev parent reply other threads:[~2026-10-20 21:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-16 3:31 [PATCH net-next v4 0/2] net: annotate remaining lockless sk->sk_err accesses Quanye Yang via B4 Relay
2026-10-16 3:31 ` [PATCH net-next v4 1/2] tls: annotate lockless access to sk->sk_err Quanye Yang via B4 Relay
2026-10-20 21:23 ` Jakub Kicinski [this message]
2026-10-16 3:31 ` [PATCH net-next v4 2/2] net: annotate lockless writes " Quanye Yang via B4 Relay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261020142342.4d9ef62c@kernel.org \
--to=kuba@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=devnull+quanyeyang.proton.me@kernel.org \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=jakub@cloudflare.com \
--cc=jiayuan.chen@linux.dev \
--cc=john.fastabend@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=quanyeyang@proton.me \
--cc=sd@queasysnail.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox