[MPTCP] Re: [PATCH] mptcp: dispose initial struct socket when its subflow is closed

[MPTCP] Re: [PATCH] mptcp: dispose initial struct socket when its subflow is closed

[Florian Westphal]

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

Florian Westphal <fw(a)strlen.de> wrote:
> Christoph Paasch reported following crash:
> dst_release underflow
> WARNING: CPU: 0 PID: 1319 at net/core/dst.c:175 dst_release+0xc1/0xd0 net/core/dst.c:175
> CPU: 0 PID: 1319 Comm: syz-executor217 Not tainted 5.11.0-rc6af8e85128b4d0d24083c5cac646e891227052e0c #70
> Call Trace:
>  rt_cache_route+0x12e/0x140 net/ipv4/route.c:1503
>  rt_set_nexthop.constprop.0+0x1fc/0x590 net/ipv4/route.c:1612
>  __mkroute_output net/ipv4/route.c:2484 [inline]
> ...
> 
> Problem is that worker leaves msk->subflow alone even when it
> happened to close the subflow ssk associated with it.
> 
> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/157
> Reported-by: Christoph Paasch <cpaasch(a)apple.com>
> Suggested-by: Paolo Abeni <pabeni(a)redhat.com>
> Signed-off-by: Florian Westphal <fw(a)strlen.de>
> ---
>  net/mptcp/protocol.c | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index d49e0efbdd50..c30dff10ed9a 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -2106,6 +2106,14 @@ static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk)
>  	return backup;
>  }
>  
> +static void mptcp_dispose_initial_subflowg(struct mptcp_sock *msk)
> +{

Grrr.  This should be 'mptcp_dispose_initial_subflow'.

Also note that msk->first also needs treatment, but I'd do that
in another patch.