diff options
author | Alexei Starovoitov <ast@kernel.org> | 2020-06-02 11:50:23 -0700 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2020-06-02 11:51:15 -0700 |
commit | f371c923505010b28c8a76f7d7973c014a1d0f5c (patch) | |
tree | 47088e7997d1baf81e988db64874164ff5bbe234 /tools/testing/selftests/bpf/prog_tests/ringbuf.c | |
parent | 9a25c1df24a6fea9dc79eec950453c4e00f707fd (diff) | |
parent | c4ba153b6501fa7ccfdc7e57946fb1d6011e36e8 (diff) | |
download | linux-f371c923505010b28c8a76f7d7973c014a1d0f5c.tar.bz2 |
Merge branch 'csum-fixes'
Daniel Borkmann says:
====================
This series fixes an issue originally reported by Lorenz Bauer where using
the bpf_skb_adjust_room() helper hid a checksum bug since it wasn't adjusting
CHECKSUM_UNNECESSARY's skb->csum_level after decap. The fix is two-fold:
i) We do a safe reset in bpf_skb_adjust_room() to CHECKSUM_NONE with an opt-
out flag BPF_F_ADJ_ROOM_NO_CSUM_RESET.
ii) We add a new bpf_csum_level() for the latter in order to allow users to
manually inc/dec the skb->csum_level when needed.
The series is rebased against latest bpf-next tree. It can be applied there,
or to bpf after the merge win sync from net-next.
Thanks!
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/ringbuf.c')
0 files changed, 0 insertions, 0 deletions