Merge branch 'sockmap-ulp-fixes'

Browse source

Daniel Borkmann says:

====================
Batch of various fixes related to BPF sockmap and ULP, including
adding module alias to restrict module requests, races and memory
leaks in sockmap code. For details please refer to the individual
patches. Thanks!
====================

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

...

This commit is contained in:

Alexei Starovoitov 2018-08-16 14:58:08 -07:00

parent 965931e3a8 585f5a6252

commit cbb2fb13db

4 changed files with 76 additions and 53 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

4

include/net/tcp.h

View file

122

kernel/bpf/sockmap.c

View file

4

net/ipv4/tcp_ulp.c

View file

1

net/tls/tls_main.c

View file