Merge branch 'fix-ktls-with-sk_skb_verdict'

Browse source

John Fastabend says:

====================
If a socket is running a BPF_SK_SKB_SREAM_VERDICT program and KTLS is
enabled the data stream may be broken if both TLS stream parser and
BPF stream parser try to handle data. Fix this here by making KTLS
stream parser run first to ensure TLS messages are received correctly
and then calling the verdict program. This analogous to how we handle
a similar conflict on the TX side.

Note, this is a fix but it doesn't make sense to push this late to
bpf tree so targeting bpf-next and keeping fixes tags.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2020-06-01 14:16:48 -07:00

parent df8fe57c07 463bac5f1c

commit 7b805819c4

6 changed files with 296 additions and 48 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

include/linux/skmsg.h

View file

9

include/net/tls.h

View file

98

net/core/skmsg.c

View file

20

net/tls/tls_sw.c

View file

46

tools/testing/selftests/bpf/progs/test_sockmap_kern.h

View file

163

tools/testing/selftests/bpf/test_sockmap.c

View file