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 B730036AB59 for ; Tue, 3 Feb 2026 20:20:02 +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=1770150002; cv=none; b=FGU7ZLcGW8CjAMR7K/HH9BhunSR1vAcHHEbV7EGwXiGQvpMI7h/DfiiBT7Fuq8ekSvdTlKhZYqLE0E+xA4nbmiSIG0MVOxhpe0OCvE3udUqMVgqLrET875hxmX3M3WAJC/dHJVYU0/W6ht83/ND7Gv096Bt2Z7jK+SKkmC0HitE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770150002; c=relaxed/simple; bh=gLBSuQWINTTTHaRau0OeudS55z5l0njEPTXe/CSRxn0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tATgyAwa1fbqfRXbZ6W2ARWSxjMazF8w6B6HpOzzeRH0VzhNToIo+/Ek6fV4zu0HUPEkU1pMPRYiqw7Blv1M9zKLI3gEnhDkzMzcH6Pc1SLAogvfjwITHJfzApmKUSrE/9GqQFRQD8+m7GBr9JS8ohdUQjP4Mt729mbCWBSIgPg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TRfK/3u9; 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="TRfK/3u9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDAC8C19422; Tue, 3 Feb 2026 20:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770150002; bh=gLBSuQWINTTTHaRau0OeudS55z5l0njEPTXe/CSRxn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRfK/3u9nplVRNCSrf4+A+lyFloqus2i9dlwrsKlbenokaErBNcI6Uzawy7Smg3/g RJSFcK/LRk73YTEObjkoQ4u5X597+Wy1zxsQtdqn8kUtkRHU+ifiCfj/LIl7/nS1OO K7aUNV6CpEETiEvftU6Wt08lZW2hDNobAB4p3tacX4S1r/9DDhlj9Ex8RdOgt5POQ+ yEtbIdqbrnvtHygeRcqJKM/zUG81jFJ/8+TNASlC6SsILFQOehAT1WWseJ2Ke3eS+X I8xG+kpfhFvzUHsXjg4zrWyAgprffX7Be+Zilh+9lm3ohgAfiamVsqzg3eJliG2mGN oGzvd8/nvdY2A== From: Sasha Levin To: stable@vger.kernel.org Cc: "Matthieu Baerts (NGI0)" , Marco Angaroni , Geliang Tang , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15.y] mptcp: avoid dup SUB_CLOSED events after disconnect Date: Tue, 3 Feb 2026 15:20:00 -0500 Message-ID: <20260203202000.1387755-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026020301-griminess-trespass-07fe@gregkh> References: <2026020301-griminess-trespass-07fe@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 280d654324e33f8e6e3641f76764694c7b64c5db ] In case of subflow disconnect(), which can also happen with the first subflow in case of errors like timeout or reset, mptcp_subflow_ctx_reset will reset most fields from the mptcp_subflow_context structure, including close_event_done. Then, when another subflow is closed, yet another SUB_CLOSED event for the disconnected initial subflow is sent. Because of the previous reset, there are no source address and destination port. A solution is then to also check the subflow's local id: it shouldn't be negative anyway. Another solution would be not to reset subflow->close_event_done at disconnect time, but when reused. But then, probably the whole reset could be done when being reused. Let's not change this logic, similar to TCP with tcp_disconnect(). Fixes: d82809b6c5f2 ("mptcp: avoid duplicated SUB_CLOSED events") Cc: stable@vger.kernel.org Reported-by: Marco Angaroni Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/603 Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260127-net-mptcp-dup-nl-events-v1-1-7f71e1bc4feb@kernel.org Signed-off-by: Jakub Kicinski [ Adjust context ] Signed-off-by: Sasha Levin --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 98fd4ffe6f115..43cdf562ff5ea 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2397,8 +2397,8 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow) { - /* The first subflow can already be closed and still in the list */ - if (subflow->close_event_done) + /* The first subflow can already be closed or disconnected */ + if (subflow->close_event_done || READ_ONCE(subflow->local_id) < 0) return; subflow->close_event_done = true; -- 2.51.0