Skip to content

Commit 9634cb3

Browse files
matttbekuba-moo
authored andcommitted
mptcp: pm: ADD_ADDR rtx: always decrease sk refcount
When an ADD_ADDR is retransmitted, the sk is held in sk_reset_timer(). It should then be released in all cases at the end. Some (unlikely) checks were returning directly instead of calling sock_put() to decrease the refcount. Jump to a new 'exit' label to call __sock_put() (which will become sock_put() in the next commit) to fix this potential leak. While at it, drop the '!msk' check which cannot happen because it is never reset, and explicitly mark the remaining one as "unlikely". Fixes: 00cfd77 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-4-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 5cd6e0a commit 9634cb3

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

net/mptcp/pm.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
331331

332332
pr_debug("msk=%p\n", msk);
333333

334-
if (!msk)
335-
return;
336-
337-
if (inet_sk_state_load(sk) == TCP_CLOSE)
338-
return;
334+
if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE))
335+
goto exit;
339336

340337
bh_lock_sock(sk);
341338
if (sock_owned_by_user(sk)) {
@@ -373,6 +370,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
373370

374371
out:
375372
bh_unlock_sock(sk);
373+
exit:
376374
__sock_put(sk);
377375
}
378376

0 commit comments

Comments
 (0)