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 79D89279792 for ; Tue, 19 May 2026 00:45:45 +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=1779151545; cv=none; b=Tx8eNNrQTJzk8VNKCQKRhaS3KTxx8qR1hgH0yeW649DBadt8NiPZjafZ3/dX6xAE70SqR9PTLzQuuif+C35zZthvdq6xJBw/paP9VOaTSsWLHQri398E/vMDpfTa46AxD750q7gNwvy329DgPmEAY8l2ay82j4lGQ5fi6ADe9gs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779151545; c=relaxed/simple; bh=5M7sL8hiFMHn+19O1XV8rPV2deS6S0rX5R7GPzHamVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mYMzTsehuzdBpFwhZHvHPsB9dJjg8crrCNPHbiujM3uvjazpc023Sk3TnUTJoa6qmV4iR7eRBf+IKc3DwuftfIAsIydTFu9lWxOYE8wn643hXz5eQyY8l6kfdYaWXc/7xAMdSG7QrH6f92SzxYfxANU7bupddkoz916Heh8+xmI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zn1SKZ9z; 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="Zn1SKZ9z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A59C8C2BCB8; Tue, 19 May 2026 00:45:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779151545; bh=5M7sL8hiFMHn+19O1XV8rPV2deS6S0rX5R7GPzHamVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zn1SKZ9z7/kTNOUmIwLbUHiGAp26UF7CZ/zYztjD6jdTSJv3dXq3oGx7PRSlUJAKV fwHkQ33eooqs2dT+CntpK/er3Hb2J4CtiqmMOmwIOyxv1yvWTKbiDWxW59E7lNgGpO r1LKcvekEYsKwOiRwiZsygNhTADsYMZMbhQzmoJCRroFkd78raoh18TH8lRk5KJLBb Y6Blh8xP8y0w7nNZQoPibXYbLD3IsbDuPapLwtiW5Fg/CXY/tAmbViX1ChSkqE3pnm 04ANhvdkOq/Bok8wm09SQM77PAVeyc8MWABLCRvPhqkWmwMO/nKkzzDrzYqM4FuNuF 6WNArYTExpKSg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Mat Martineau , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y] mptcp: pm: ADD_ADDR rtx: always decrease sk refcount Date: Mon, 18 May 2026 20:45:42 -0400 Message-ID: <20260519004542.1928600-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051231-disrupt-dizziness-b157@gregkh> References: <2026051231-disrupt-dizziness-b157@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 28f8d7fb7bdf3..fa4ceeb443800 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -299,11 +299,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