Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Browse source

Daniel Borkmann says:

====================
pull-request: bpf 2018-09-24

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) Several fixes for BPF sockmap to only allow sockets being attached in
   ESTABLISHED state, from John.

2) Fix up the license to LGPL/BSD for the libc compat header which contains
   fallback helpers that libbpf and bpftool is using, from Jakub.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2018-09-24 10:08:45 -07:00

parent d26ed6b0e5 fad0c40fab

commit d2f85c9e1c

3 changed files with 79 additions and 24 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

91

kernel/bpf/sockmap.c

View file

2

tools/include/tools/libc_compat.h

View file

10

tools/testing/selftests/bpf/test_maps.c

View file