From: David S. Miller Date: Fri, 9 Aug 2019 20:14:46 +0000 (-0700) Subject: Merge branch 'Fix-collisions-in-socket-cookie-generation' X-Git-Tag: v5.15~5684^2~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=703acf62596589acba6bfa31ab5573d1e8e4afa6;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'Fix-collisions-in-socket-cookie-generation' 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 --- 703acf62596589acba6bfa31ab5573d1e8e4afa6