From: Daniel Borkmann Date: Sat, 22 Sep 2018 00:46:42 +0000 (+0200) Subject: Merge branch 'bpf-sockmap-estab-fixes' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fad0c40fab14523ca381a30fef88b7c3266bef1c;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'bpf-sockmap-estab-fixes' John Fastabend says: ==================== Eric noted that using the close callback is not sufficient to catch all transitions from ESTABLISHED state to a LISTEN state. So this series does two things. First, only allow adding socks in ESTABLISH state and second use unhash callback to catch tcp_disconnect() transitions. v2: added check for ESTABLISH state in hash update sockmap as well v3: Do not release lock from unhash in error path, no lock was used in the first place. And drop not so useful code comments v4: convert, if (unhash()) return unhash(); return to if (unhash()) unhash(); return; Thanks for reviewing Yonghong I carried your ACKs forward. ==================== Signed-off-by: Daniel Borkmann --- fad0c40fab14523ca381a30fef88b7c3266bef1c