diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2020-12-16 12:48:33 +0100 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-12-17 10:24:47 -0800 |
| commit | 3f8b2667f257c21a992bda33bfb919ee164a429c (patch) | |
| tree | 834ba5fc000948bdca0c0a44a34ff7fa77426c96 /net/mptcp/protocol.c | |
| parent | mptcp: fix security context on server socket (diff) | |
| download | linux-dev-3f8b2667f257c21a992bda33bfb919ee164a429c.tar.xz linux-dev-3f8b2667f257c21a992bda33bfb919ee164a429c.zip | |
mptcp: properly annotate nested lock
MPTCP closes the subflows while holding the msk-level lock.
While acquiring the subflow socket lock we need to use the
correct nested annotation, or we can hit a lockdep splat
at runtime.
Reported-and-tested-by: Geliang Tang <geliangtang@gmail.com>
Fixes: e16163b6e2b7 ("mptcp: refactor shutdown and close")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | net/mptcp/protocol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d24243a28fce..64c0c54c80e8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2119,7 +2119,7 @@ void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, list_del(&subflow->node); - lock_sock(ssk); + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); /* if we are invoked by the msk cleanup code, the subflow is * already orphaned |