Skip to content

bpf, sockmap: Fix tp->copied_seq update in, tcp_bpf_strp_read_sock #10227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: bpf-next_base
Choose a base branch
from
+5 −3
Open

bpf, sockmap: Fix tp->copied_seq update in, tcp_bpf_strp_read_sock #10227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions net/ipv4/tcp_bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,9 +676,11 @@ int tcp_bpf_strp_read_sock(struct strparser *strp, read_descriptor_t *desc,
* For SK_REDIRECT, we need to ack the frame immediately but for
* SK_PASS, we want to delay the ack until tcp_bpf_recvmsg_parser().
*/
tp->copied_seq = psock->copied_seq - psock->ingress_bytes;
tcp_rcv_space_adjust(sk);
__tcp_cleanup_rbuf(sk, copied - psock->ingress_bytes);
if (!psock->ingress_bytes) {
tp->copied_seq += copied;
tcp_rcv_space_adjust(sk);
__tcp_cleanup_rbuf(sk, copied);
}
out:
rcu_read_unlock();
return copied;
Expand Down
Loading