From: David S. Miller <davem@davemloft.net>
Date: Thu, 1 Apr 2021 23:02:51 +0000 (-0700)
Subject: Merge branch 'mptcp-deadlock'
X-Git-Tag: v5.12-rc7~13^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efd2e92dd2fba35802fefffa776cf9151270d41d;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mptcp-deadlock'

Paolo Abeni says:

====================
mptcp: mptcp: fix deadlock in mptcp{,6}_release

syzkaller has reported a few deadlock triggered by
mptcp{,6}_release.

These patches address the issue in the easy way - blocking
the relevant, multicast related, sockopt options on MPTCP
sockets.

Note that later on net-next we are going to revert patch 1/2,
as a part of a larger MPTCP sockopt implementation refactor
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

efd2e92dd2fba35802fefffa776cf9151270d41d