From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0BB6644102E for ; Thu, 3 Sep 2026 08:35:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788424523; cv=none; b=rDa4odNOFp52jz/dsqX/mpXvoLO9IbkQdLTDuJazLKFBMgbBUqxqGynJbuAFAQ5tA354KxvzqxEM+j8NNBUCLzjPJ1/Gk0+9nMFtUlrurzWzSfr6hEHQGmrGSMcjeMKrgsJxruNu7NceAhSVnqRZ/cD4OPdImzLoT0gX0g6lDF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788424523; c=relaxed/simple; bh=/al7R5lGyABC5BAdv2q6KsiylkPVrrOvcHfyvOD6jio=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=JratKkaJg309zSTwEByTzy95ofi+mCyRbBdUUMkDv6diycvQERIUxK3wRfv6CqDlJzLOdCxvHxSQLIhkF054MkEp+Z4kX0F2xn+/wU4TqDBkb578WBG5zrLY6t1/8Tre65B0eCw7WQ98kY9N5C4QIvJg4SJ1rSPsK9N+S0ZF4wM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=pUIiKenQ; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pUIiKenQ" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-499ac87c92bso20851665e9.1 for ; Thu, 03 Sep 2026 01:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788424520; x=1789029320; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Xk9CG0h6HWfqzzpvcIHPsx0W6k1L3yQKeOEbT++aQsw=; b=pUIiKenQG1U+GVK5KR1bp0PB/OI2VQDbQ49VUHqP658yAGp9PlHO1T0yfQXrDkl5cB QKBWDxwBHowxaNINq3EtPx/2pq8RAcsux7tiIJTzJGT///9/mzcGDse2kk3rO4fsWw2m uln7yZIePBi5II9XdRYtZg9mkkoFwwpP9dGH2vhYOke6L6ssxwy3a3t/XvvgTYl/fplT /ZIwgaT40rkAw7wIaEI2O9rZz7SfnNhR3n8VV4SfrgDeTmDOQjHjO5/sy0p4KBbsNMhE pejbB61P7EFOBtjDe3dHaBtoQs7p3JFtbUgML3qPeOQiooEndUBfUJlwzIkgpq90SYig RiPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788424520; x=1789029320; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Xk9CG0h6HWfqzzpvcIHPsx0W6k1L3yQKeOEbT++aQsw=; b=RrumtlfNVeGX3ZD+ecofj/FAXuaK7nhPwkOt/Doid2ZviVJb0FFnRuYntB12tLNh+W 2uDbPYUD2XMnTiiF90XT+bMOPmdX3Wtc8NXVrrM35Mz2Aqlq1wZ2uJYZWEw7o19+nhOD M95ZMIBww0l7QJTu0+81/rBlHAlX9/Yffz0/nwcsI95iDFTXYmLxDDV43BY+nNS4QgW1 cm+8kujc04I8AXNvz8/msaiMh+v4l6AF1M0a7NP7JTRx7Jz2ogzD5izeFTX1FFBJS5WG dGtuHSjX80kXClVkEQv4gYAOM5Jru3MOPU/FO89GOVaU+aDMb55Siw4C60QEUFIxCUO4 JK2w== X-Forwarded-Encrypted: i=1; AKwUvBwXflq0idSB+rWZWWXGF50+cGobR9D3R6hbkMDbLDVKpLsS0QGXhUgdY+tXSVjpGnJYqpKoMo+6pJMVs04=@vger.kernel.org X-Gm-Message-State: AFuF++mQ261xMaybajumbsIes50CVo9nPB6GegNELfFL0EPVwE5X5Huq eIbcOT50mXQc83grPdk8FbtyeEkm02Q6/xHEjR5n7KFHhS2cb01p8P8H X-Gm-Gg: AYBFou36RwYkVvU5G0l6UeCuQRgUqgF//MZtyA/qTvhb7s/h7Jc3tQVrg7IPblOj5BF LSDsdaDAc5ni8dpN/g/E4kCZctrWc1g8tn4bl+z26Ib3DQmofSHYR9zVpqWZUBdF19/p6OPD8eR FDvBmeoOM0jesA7oZdHnzDuc/U8+SbAWA25ltkp6OYj57SoTslotXCJ2Xo6+SJCQJkz/kyKwqDy KsIEVjS0rWN3iJZtcd1K/Vimr6TmgZ2bunRJyqp0Cskx5DLD41Ko+yw5wRRHB/NODijkRUMWdGQ RIAixtSfxyxVhX3Xs/d0UXQM2C8lpkPyiaAv8hAVlPHZmqwj2fVAhhrx0ZbmC3IZ+bSDv9y2BsI VM43F8NjExrYuvvkLdlp446wVX5XcOcqjAKBVHrBreKMWvb2NOlA0wounhEUxERPZUFaHUYsg3C w8k9mN6sNMBe33e9nwgaCiDWF9sNlCqtYPkvFvjgmj5bsyTVewc+0v01xcKRKg7GVNCOeOwah1D KY9sOOOZkPAfIYomvSIulB3bH3QxJ9J4zGJQHw4ZOTsHlFjGuYQHq/zleTt/bW/FP0dztTl7G7G bvVzBapZRo8Is8t1hrOPOcUz1p9bZEZsYXOB1Hk6Zfxkaa4sbai75aQ6y+uEa/YZH609F4FvXiJ PErIS X-Received: by 2002:a05:600c:8b10:b0:49b:12c2:104f with SMTP id 5b1f17b1804b1-49ce55ecddamr220293825e9.1.1788424519871; Thu, 03 Sep 2026 01:35:19 -0700 (PDT) Received: from MacBook-Pro-von-Karl.localdomain (dynamic-2a02-3100-a979-9501-3df6-d7fa-8a5a-06c5.310.pool.telefonica.de. [2a02:3100:a979:9501:3df6:d7fa:8a5a:6c5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49ce58da3acsm228357425e9.0.2026.09.03.01.35.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Sep 2026 01:35:19 -0700 (PDT) From: Karl Mehltretter To: stable@vger.kernel.org Cc: Karl Mehltretter , Greg Kroah-Hartman , Matthieu Baerts , Mat Martineau , Geliang Tang , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5.10.y 0/2] mptcp: fix ADD_ADDR retransmission socket leaks Date: Thu, 3 Sep 2026 10:35:10 +0200 Message-Id: <20260903083512.99864-1-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Backport the two ordered ADD_ADDR retransmission timer fixes missing from 5.10.y. Patch 1 makes every terminal path release the socket reference held by the timer. Patch 2 uses sock_put() so the last reference frees the socket, while avoiding a timer self-deadlock during destruction. Both fixes carry Cc: stable and are present in 5.15.y and every newer supported LTS. The original 11-patch cover groups patches 3-5 as the v5.10 ADD_ADDR timer data-race and leak fixes. Patch 3 is already present as d9b272a85fe6 ("mptcp: pm: ADD_ADDR rtx: fix potential data-race"); this series supplies the missing ordered patches 4 and 5: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-0-fca8091060a4@kernel.org In v5.10 the timer code is in pm_netlink.c and uses fixed retransmission delays; the adaptations retain those details. Patch 1 also routes v5.10's unreachable ID 0 guard through the reference drop. Tested on v5.10.269 with KASAN under QEMU. A targeted A/B forced the tracked MPTCP socket to TCP_CLOSE at timer entry: the vulnerable kernel ran the callback without destroying the socket, while the fixed kernel destroyed it. Both completed an identical MPTCP transfer without a KASAN report, Oops, or warning. The fixed kernel also passed all 15 tests in pm_netlink.sh, a 16 MiB bidirectional transfer with a real ADD_ADDR/MP_JOIN second subflow, and an 8 MiB curl --mptcp transfer. All payload comparisons were byte-exact. Matthieu Baerts (NGI0) (2): mptcp: pm: ADD_ADDR rtx: always decrease sk refcount mptcp: pm: ADD_ADDR rtx: free sk if last net/mptcp/pm_netlink.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) -- 2.53.0