OSDN Git Service

Merge branch 'bpf-sockmap-estab-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Sat, 22 Sep 2018 00:46:42 +0000 (02:46 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Sat, 22 Sep 2018 00:46:43 +0000 (02:46 +0200)
commitfad0c40fab14523ca381a30fef88b7c3266bef1c
tree190592cc86e20253f0c3220c2bcaeb24e2dd4d5e
parent080220b687147fd9376878534aba7194f17f6ef5
parent5028027844cfc6168e39650abecd817ba64c9d98
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 <daniel@iogearbox.net>