From: Alexei Starovoitov <ast@kernel.org>
Date: Sat, 7 Jul 2018 22:16:58 +0000 (-0700)
Subject: Merge branch 'sockmap-fixes'
X-Git-Tag: v4.18-rc6~28^2~61^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=631da8534aeea2e2f8b36a832d065a203f24fa43;p=linux.git

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>
---

631da8534aeea2e2f8b36a832d065a203f24fa43