projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c48424d 1d1ef00)
Merge branch 'sockmap-fixes'
authorAlexei Starovoitov <ast@kernel.org>
Sat, 7 Jul 2018 22:16:58 +0000 (15:16 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 7 Jul 2018 22:16:59 +0000 (15:16 -0700)
commit631da8534aeea2e2f8b36a832d065a203f24fa43
tree91b442e56a0eae99b6be5071dc95eaf2e2cddc12tree | snapshot
parentc48424d993fafd1e04b228fbd46176f828233d82commit | diff
parent1d1ef005dbc6de673c62cbd2562290ada3090463commit | diff
Merge branch 'sockmap-fixes'

John Fastabend says:

====================
I missed fixing the error path in the sockhash code to align with
supporting socks in multiple maps. Simply checking if the psock is
present does not mean we can decrement the reference count because
it could be part of another map. Fix this by cleaning up the error
path so this situation does not happen.
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Domain: System / Kernel;