From: Kyle Zeng <kylebot@openai.com>
To: bpf@vger.kernel.org
Cc: john.fastabend@gmail.com, jakub@cloudflare.com,
jiayuan.chen@linux.dev, netdev@vger.kernel.org,
alexei.starovoitov@gmail.com, Kyle Zeng <kylebot@openai.com>,
stable@vger.kernel.org
Subject: [PATCH bpf v2] net: skmsg: fix copy cursor when coalescing clones
Date: Fri, 20 Nov 2026 13:45:11 -0800 [thread overview]
Message-ID: <20261120214511.25934-1-kylebot@openai.com> (raw)
A splice or zero-copy append can leave the destination copy cursor at
sg.end. If sk_msg_clone() subsequently coalesces with the last entry,
sg.end does not advance and the cursor still points at an unused slot.
sk_msg_memcopy_from_iter() can then walk around the ring and write into
older entries, including file pages spliced from a read-only descriptor.
Software TLS can reach this with an ordinary MSG_MORE send after a file
splice and a splice from another TCP socket. Both TCP and the TLS
encrypted-message allocation can use the sending task's page fragment,
so the TCP-sourced plaintext can be contiguous with the next cloned
encrypted-message range.
When coalescing with an exhausted destination, move the copy cursor to
the tail and set copybreak to its old length before extending it. Find
the actual tail on each iteration using the ring iterator, including
when end wraps to zero. Leave an existing copy cursor unchanged and
preserve the normal coalescing, reference counting, and memory charging.
The issue was found by an LLM.
Fixes: fda497e5f5b8 ("Optimize sk_msg_clone() by data merge to end dst sg entry")
Cc: stable@vger.kernel.org
Signed-off-by: Kyle Zeng <kylebot@openai.com>
---
v2:
- Rebase onto the BPF fixes tree; no code changes.
v1: https://lore.kernel.org/bpf/20261030042138.73739-1-kylebot@openai.com/
I have a reproducer for this issue and can share via DM
net/core/skmsg.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 8a3b8536c0c2..f47c59ba1ec6 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -103,16 +103,26 @@ int sk_msg_clone(struct sock *sk, struct sk_msg *dst, struct sk_msg *src,
}
while (len) {
+ int last = dst->sg.end;
+
sge_len = sge->length - off;
if (sge_len > len)
sge_len = len;
- if (dst->sg.end)
- sgd = sk_msg_elem(dst, dst->sg.end - 1);
+ sgd = NULL;
+ if (dst->sg.size) {
+ sk_msg_iter_var_prev(last);
+ sgd = sk_msg_elem(dst, last);
+ }
if (sgd &&
(sg_page(sge) == sg_page(sgd)) &&
(sg_virt(sge) + off == sg_virt(sgd) + sgd->length)) {
+ /* Start copying at the newly cloned suffix. */
+ if (dst->sg.curr == dst->sg.end) {
+ dst->sg.curr = last;
+ dst->sg.copybreak = sgd->length;
+ }
sgd->length += sge_len;
dst->sg.size += sge_len;
} else if (!sk_msg_full(dst)) {
base-commit: d5ba86298b45e1a81c578c499e9a222a3b734d5d
--
2.55.0.openai.911.g06873a30d2f3
reply other threads:[~2026-11-20 21:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261120214511.25934-1-kylebot@openai.com \
--to=kylebot@openai.com \
--cc=alexei.starovoitov@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=jakub@cloudflare.com \
--cc=jiayuan.chen@linux.dev \
--cc=john.fastabend@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.