[PATCH bpf 09/11] bpf, sockmap: Fix apply_bytes when a redirect sends only a part
From: Jiayuan Chen
Date: Sat Nov 21 2026 - 05:37:00 EST
An sk_msg prog can parse the header of an application message and call
bpf_msg_apply_bytes() with the message length. The verdict then covers
the whole message, and the prog runs again at the next header:
+-----+-----------+-----+-------+-----+------
| hdr | body | hdr | body | hdr | ...
+-----+-----------+-----+-------+-----+------
^ ^ ^
prog: apply(len1) prog: apply(len2)
prog: apply(len3)
For SK_REDIRECT, tcp_bpf_send_verdict() takes tosend bytes off
apply_bytes before the redirect. But the redirect can send only a part:
the ingress target can't get more memory, or the egress target has no
send buffer left. The rest stays in msg, or goes back to the user who
sends it again. The verdict has already used up these bytes, so the prog
runs on the rest, in the middle of a message:
+-----+-----------+-----+-------+------
| hdr | body | hdr | body | ...
+-----+-----------+-----+-------+------
|<- apply(len1) ->|
|<-- sent -->|
^
prog runs here and takes body as a header
>From then on the message boundaries are wrong.
Give back the bytes that were not sent, and keep the verdict while
apply_bytes is not 0. The bytes of a cork that fails are freed and
reported as sent, so they stay used.
Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Jiayuan Chen <jiayuan.chen@xxxxxxxxx>
---
net/ipv4/tcp_bpf.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index da9caccfede79..25f222b569ec8 100644
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -449,7 +449,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
{
bool cork = false, enospc = sk_msg_full(msg), redir_ingress;
struct sock *sk_redir;
- u32 tosend, origsize, sent, delta = 0;
+ u32 tosend, origsize, sent, apply, delta = 0;
u32 eval;
int ret;
@@ -518,6 +518,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
redir_ingress = psock->redir_ingress;
sk_redir = psock->sk_redir;
sock_hold(sk_redir);
+ apply = psock->apply_bytes;
sk_msg_apply_bytes(psock, tosend);
if (!psock->apply_bytes) {
/* Clean up before releasing the sock lock. */
@@ -540,10 +541,6 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
msg, tosend, flags);
sent = origsize - msg->sg.size;
- if (eval == __SK_REDIRECT)
- sock_put(sk_redir);
- sock_put(sk_redir);
-
lock_sock(sk);
sk_mem_uncharge(sk, sent);
if (unlikely(ret < 0)) {
@@ -566,6 +563,21 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
msg = NULL;
ret = 0;
}
+ /*
+ * Bytes that were not sent and come back, in msg or in the
+ * next sendmsg(), are still covered by the verdict.
+ */
+ if (apply && sent < tosend && !cork) {
+ psock->apply_bytes += tosend - sent;
+ if (eval == __SK_REDIRECT) {
+ psock->eval = eval;
+ psock->sk_redir = sk_redir;
+ eval = __SK_NONE;
+ }
+ }
+ if (eval == __SK_REDIRECT)
+ sock_put(sk_redir);
+ sock_put(sk_redir);
break;
case __SK_DROP:
default:
--
2.43.0