diff options
| author | David S. Miller <davem@davemloft.net> | 2021-05-26 01:59:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-26 01:59:24 +0300 |
| commit | f5d287126f63f76bcf50cf0b085199cc34f07d74 (patch) | |
| tree | 393ccee3bdb819a4610ce3e16a8f46fda81a9020 /net/core | |
| parent | 6dfa87b492c039c3c17e70ca0a400d9ee36f34a6 (diff) | |
| parent | 1bad6fd52be4ce12d207e2820ceb0f29ab31fc53 (diff) | |
| download | linux-f5d287126f63f76bcf50cf0b085199cc34f07d74.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2021-05-26
The following pull-request contains BPF updates for your *net* tree.
We've added 14 non-merge commits during the last 14 day(s) which contain
a total of 17 files changed, 513 insertions(+), 231 deletions(-).
The main changes are:
1) Fix bpf_skb_change_head() helper to reset mac_len, from Jussi Maki.
2) Fix masking direction swap upon off-reg sign change, from Daniel Borkmann.
3) Fix BPF offloads in verifier by reordering driver callback, from Yinjun Zhang.
4) BPF selftest for ringbuf mmap ro/rw restrictions, from Andrii Nakryiko.
5) Follow-up fixes to nested bprintf per-cpu buffers, from Florent Revest.
6) Fix bpftool sock_release attach point help info, from Liu Jian.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index cae56d08a670..65ab4e21c087 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3784,6 +3784,7 @@ static inline int __bpf_skb_change_head(struct sk_buff *skb, u32 head_room, __skb_push(skb, head_room); memset(skb->data, 0, head_room); skb_reset_mac_header(skb); + skb_reset_mac_len(skb); } return ret; |