From: David S. Miller Date: Thu, 1 Apr 2021 23:02:51 +0000 (-0700) Subject: Merge branch 'mptcp-deadlock' X-Git-Tag: accepted/tizen/unified/20230118.172025~7507^2~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efd2e92dd2fba35802fefffa776cf9151270d41d;p=platform%2Fkernel%2Flinux-rpi.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 --- efd2e92dd2fba35802fefffa776cf9151270d41d