Skip to content
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

bpf: a bug fix and test cases for bpf_skb_change_tail() #4722

Closed
wants to merge 4 commits into from
Closed

bpf: a bug fix and test cases for bpf_skb_change_tail() #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
531f6cb
bpf: Check negative offsets in __bpf_skb_min_len()
Nov 29, 2024
b385e42
selftests/bpf: Add a BPF selftest for bpf_skb_change_tail()
Nov 29, 2024
d2b30a2
selftests/bpf: Introduce socket_helpers.h for TC tests
Nov 29, 2024
f3b08dc
selftests/bpf: Test bpf_skb_change_tail() in TC ingress
Nov 29, 2024
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
21 changes: 15 additions & 6 deletions net/core/filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3734,13 +3734,22 @@ static const struct bpf_func_proto bpf_skb_adjust_room_proto = {

static u32 __bpf_skb_min_len(const struct sk_buff *skb)
{
u32 min_len = skb_network_offset(skb);
int offset = skb_network_offset(skb);
u32 min_len = 0;

if (skb_transport_header_was_set(skb))
min_len = skb_transport_offset(skb);
if (skb->ip_summed == CHECKSUM_PARTIAL)
min_len = skb_checksum_start_offset(skb) +
skb->csum_offset + sizeof(__sum16);
if (offset > 0)
min_len = offset;
if (skb_transport_header_was_set(skb)) {
offset = skb_transport_offset(skb);
if (offset > 0)
min_len = offset;
}
if (skb->ip_summed == CHECKSUM_PARTIAL) {
offset = skb_checksum_start_offset(skb) +
skb->csum_offset + sizeof(__sum16);
if (offset > 0)
min_len = offset;
}
return min_len;
}

Expand Down
Loading
Loading