From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 118C223C8C7 for ; Tue, 19 May 2026 00:54:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779152096; cv=none; b=Ag2cQilmlVkP+S+V8dTBAfRPi5RxWAWIgOQoKCFbH0GrZl6rFWe4gwSZEotdfmhuwokYyiNGyL6iL5Kbc/PUGx2Z0dvRfMO1g8ZRO48Ahk+CHWm+GFWgCcK/wBHX946ZOrGW6xp5mCH9Bkw0e9n93d37lnpRc2DQkKWYiL+28AY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779152096; c=relaxed/simple; bh=hHnS6uqU818VGStLkqC0KLx3KmJOewxKCFkw1p8M408=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KF1hvzosjK/L8bi8hHUn3kZz1IRyr0LY2sds+KJtMurf0qr0zocEHOypTgA2JppKXHRB+8y1AVeuNiqiHlMRhaNIa+5DJeAZ223+6jBTjk21xUDOPaM5h2/XL1pd5JSqwYFrsFWNkL7ICHWjXkWzK61Ih8ND5IHkoI+XNV0Kbyk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hvZp7rJA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hvZp7rJA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E357C2BCB8; Tue, 19 May 2026 00:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779152095; bh=hHnS6uqU818VGStLkqC0KLx3KmJOewxKCFkw1p8M408=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hvZp7rJA5lhPp1HAHtJ2W0w/QmgwDCsq50dSiVj+Bj7sfbImvuPE+TAL30CPZJd0J GmD9eSQi/IcfovANNApAgxQSN0qNbRFVbWCOAM7vIHmJ7Kng4QjL120rt/WE06lSSs i9cX6FQArlKejZY/GGLwG4lawRCCtOe2mgPFVBSiBPQVtJKgF7kPNVTnYPaOzzoe0s kbUeuIiW2Kkz7hVLM51nli+Bp0VmLhm95H3CM/e6LTdJrnqbDtV6Uo4jJUl+UGtDW/ pxlNzgUE1iu2LYBXcMToDq6mRqNQvGvDFmPkt9rleFqrdUAGFIHBXoPWbzqfnwdOpB 9iWYfUTasLFHg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] mptcp: pm: ADD_ADDR rtx: always decrease sk refcount Date: Mon, 18 May 2026 20:54:53 -0400 Message-ID: <20260519005453.1978642-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051231-fester-hedge-8062@gregkh> References: <2026051231-fester-hedge-8062@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Matthieu Baerts (NGI0)" [ Upstream commit 9634cb35af17019baec21ca648516ce376fa10e6 ] 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: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-4-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski [ reused existing `out:` label instead of introducing a new `exit:` label since stable's `out:` only does `__sock_put(sk)` ] Signed-off-by: Sasha Levin --- net/mptcp/pm_netlink.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index a16a7a538c425..ff077cf94d7a5 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -309,11 +309,8 @@ static void mptcp_pm_add_timer(struct timer_list *timer) pr_debug("msk=%p\n", msk); - if (!msk) - return; - - if (inet_sk_state_load(sk) == TCP_CLOSE) - return; + if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE)) + goto out; if (!entry->addr.id) return; -- 2.53.0