mptcp: put reference in mptcp timeout timer
authorFlorian Westphal <fw@strlen.de>
Tue, 24 Nov 2020 16:24:46 +0000 (17:24 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 25 Nov 2020 20:32:45 +0000 (12:32 -0800)
commitb6d69fc8e8cfd1694e709c16e6192339bde68923
treecb6a591db615fdb8845e506b1bcb2057a91fc032
parent4826d2c4fcbfcc3ba7887a197143ffe4d444a3d3
mptcp: put reference in mptcp timeout timer

On close this timer might be scheduled. mptcp uses sk_reset_timer for
this, so the a reference on the mptcp socket is taken.

This causes a refcount leak which can for example be reproduced
with 'mp_join_server_v4.pkt' from the mptcp-packetdrill repo.

The leak has nothing to do with join requests, v1_mp_capable_bind_no_cs.pkt
works too when replacing the last ack mpcapable to v1 instead of v0.

unreferenced object 0xffff888109bba040 (size 2744):
  comm "packetdrill", [..]
  backtrace:
    [..] sk_prot_alloc.isra.0+0x2b/0xc0
    [..] sk_clone_lock+0x2f/0x740
    [..] mptcp_sk_clone+0x33/0x1a0
    [..] subflow_syn_recv_sock+0x2b1/0x690 [..]

Fixes: e16163b6e2b7 ("mptcp: refactor shutdown and close")
Cc: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20201124162446.11448-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/protocol.c