From: Jakub Kicinski <kuba@kernel.org>
To: Sabrina Dubroca <sd@queasysnail.net>
Cc: davem@davemloft.net, netdev@vger.kernel.org, edumazet@google.com,
pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org,
john.fastabend@gmail.com, bpf@vger.kernel.org,
Sashiko <sashiko-bot@kernel.org>,
daniel@iogearbox.net, jonathan.lemon@gmail.com
Subject: Re: [PATCH net v2 2/4] net: tls: prevent chain-after-chain in plain text SG
Date: Tue, 12 May 2026 09:03:42 -0700 [thread overview]
Message-ID: <20260512090342.15779c9a@kernel.org> (raw)
In-Reply-To: <agMKcBrJYK5UIcsZ@krikkit>
On Tue, 12 May 2026 13:09:36 +0200 Sabrina Dubroca wrote:
> 2026-05-11, 10:49:18 -0700, Jakub Kicinski wrote:
> > diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
> > index 2608b0c01849..3bfdaf5e64f5 100644
> > --- a/net/tls/tls_sw.c
> > +++ b/net/tls/tls_sw.c
> > @@ -789,21 +789,33 @@ static int tls_push_record(struct sock *sk, int flags,
> > i = msg_pl->sg.end;
> > sk_msg_iter_var_prev(i);
> >
> > + /* msg_pl->sg.data is a ring; data[MAX+1] is reserved for the wrap
> > + * link (frags won't use it). 'i' is now the last filled entry:
> > + *
> > + * i end start
> > + * v v v [ rsv ]
> > + * [ d ][ d ][ ][ ]...[ ][ d ][ d ][ d ][chain]
> > + * ^ END v
> > + * `-----------------------------------------'
> > + *
> > + * Note that SGL does not allow chain-after-chain, so for TLS 1.3,
> > + * we must make sure we don't create the wrap entry and then chain
> > + * link to content_type immediately at index 0.
> > + */
>
> All this wrapping with extra "hidden" slots is so confusing...
Yes, always takes me an hour to swap the context back in.
I was hoping the diagram would help.
> > + if (i < msg_pl->sg.start)
> > + sg_chain(msg_pl->sg.data, ARRAY_SIZE(msg_pl->sg.data),
> > + msg_pl->sg.data);
> > +
> > rec->content_type = record_type;
> > if (prot->version == TLS_1_3_VERSION) {
> > /* Add content type to end of message. No padding added */
> > sg_set_buf(&rec->sg_content_type, &rec->content_type, 1);
> > sg_mark_end(&rec->sg_content_type);
> > - sg_chain(msg_pl->sg.data, msg_pl->sg.end + 1,
> > - &rec->sg_content_type);
> > + sg_chain(msg_pl->sg.data, i + 2, &rec->sg_content_type);
>
> Probably a silly question: why do we need to chain the content type?
> Could we just drop it directly into the right slot of msg_pl?
Good question, IDK either. Maybe anticipating the need for padding?
Do you prefer that as the fix, or follow up in net-next is fine?
> (I'm also a bit puzzled by the "last_filled + 2"/"end + 1", because
> that would leave an empty slot between the last_filled slot and the
> content_type? and maybe even overwrite the first actual message chunk
> if we had filled the message?)
Incredibly confusingly the value passed to sg_chain is the arrays size.
So it's entry target + 1. IDK if that answer your question but it always
confuses me. I even added it to the comment above but looks like I ended
up removing it.
next prev parent reply other threads:[~2026-05-12 16:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-11 17:49 [PATCH net v2 0/4] net: tls: net: tls: fix a few random bugs Jakub Kicinski
2026-05-11 17:49 ` [PATCH net v2 1/4] net: tls: fix off-by-one in sg_chain entry count for wrapped sk_msg ring Jakub Kicinski
2026-05-12 10:21 ` Sabrina Dubroca
2026-05-11 17:49 ` [PATCH net v2 2/4] net: tls: prevent chain-after-chain in plain text SG Jakub Kicinski
2026-05-12 11:09 ` Sabrina Dubroca
2026-05-12 16:03 ` Jakub Kicinski [this message]
2026-05-12 22:30 ` Sabrina Dubroca
2026-05-13 0:14 ` Jakub Kicinski
2026-05-13 0:10 ` sashiko-bot
2026-05-11 17:49 ` [PATCH net v2 3/4] net: tls: fix use-after-free in tls_sw_sendmsg_locked after bpf verdict Jakub Kicinski
2026-05-12 9:47 ` Jiayuan Chen
2026-05-12 16:04 ` Jakub Kicinski
2026-05-13 0:39 ` sashiko-bot
2026-05-11 17:49 ` [PATCH net v2 4/4] net: tls: remove bad rollback and UAF on ENOSPC Jakub Kicinski
2026-05-13 1:39 ` sashiko-bot
2026-05-12 9:28 ` [PATCH net v2 0/4] net: tls: net: tls: fix a few random bugs Jakub Sitnicki
2026-05-12 9:37 ` Sabrina Dubroca
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=20260512090342.15779c9a@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sashiko-bot@kernel.org \
--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