Merge branch 'Fix-collisions-in-socket-cookie-generation'

Browse source

Daniel Borkmann says:

====================
Fix collisions in socket cookie generation

This change makes the socket cookie generator as a global counter
instead of per netns in order to fix cookie collisions for BPF use
cases we ran into. See main patch #1 for more details.

Given the change is small/trivial and fixes an issue we're seeing
my preference would be net tree (though it cleanly applies to
net-next as well). Went for net tree instead of bpf tree here given
the main change is in net/core/sock_diag.c, but either way would be
fine with me.

v1 -> v2:
  - Fix up commit description in patch #1, thanks Eric!
====================

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

...

This commit is contained in:

David S. Miller 2019-08-09 13:14:46 -07:00

parent 7bac762d8d 609a2ca57a

commit 703acf6259

4 changed files with 11 additions and 8 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

1

include/net/net_namespace.h

View file

4

include/uapi/linux/bpf.h

View file

3

net/core/sock_diag.c

View file

11

tools/include/uapi/linux/bpf.h

View file