From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 34D93383334; Thu, 21 May 2026 03:28:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779334132; cv=none; b=R9G9oxlfL9igjx5+PK2YKcyyR2Yp79po54p2IwpeD+2RVSJryw+O50fK6jysOBFqe6hN7bHFyoLzCYqH6e2KbGNw1o72a8xPHIyK7VUwttZ5QS9akeqNHfaZrLCIMgNogOw+8B6hD2IwRBQ6ZF0HQft4XDgmqLboKcpi/vFWioY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779334132; c=relaxed/simple; bh=VbqCQ0mg1rJEhOqTkvrjuXs4O1VsCNj1JMKA1aYw8F8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TUMLu7qTcFH0G/+9CPI9zkf6Gb+zCu47bIwMt8SZVum+DwyfIdfPcJuLCil0M1SwomIckc5l24QRKEcig3R5DvkYACr++xiFss1HVEdRfpKPXcPsuvV4Rtipg9n4oJqD5IcP6DsqRZmoYPGt94F0SQOw8ffImizhtcG1JOKc0cU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d+00G8o5; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d+00G8o5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDCC51F000E9; Thu, 21 May 2026 03:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779334131; bh=s12C8NbqqG7Wl4+Y9JAgy5v7YeKLMUddX4LUWVb6h/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d+00G8o5UPpHv7NLIDxX0wzSQrduRAv/JMBRViSj4c2pgyECfYjlSh6hiIxOwWnpi EKbpbssBIQN8xxfF+at/cNJzw9EOeL62UKQMGuJe1uFZTFcc3wl+loHax519D58DA1 MLP6VjpiEyZRVVgJClH1+tgQu5SgQi6YYbReZcjTVqbtVfzif8dtDmeZAMRwTemwAO /IQXHjp1aoiwcxdqdIJXOqwxnxAsSSVqPoVOn+lHP1ujLfasnkzxAkXJKQ2RJigvoj ha71P2u5V8mjLINukw/tKIIbqzmBBK8+wPXelQIhDyeVeuVZCAoOj63NK1evYtfr/S ukD0HH7BZb/sQ== From: "Matthieu Baerts (NGI0)" To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org, Mat Martineau , Jakub Kicinski Subject: [PATCH 6.6.y 3/4] mptcp: pm: ADD_ADDR rtx: always decrease sk refcount Date: Thu, 21 May 2026 05:19:10 +0200 Message-ID: <20260521031906.740857-9-matttbe@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260521031906.740857-6-matttbe@kernel.org> References: <20260521031906.740857-6-matttbe@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1786; i=matttbe@kernel.org; h=from:subject; bh=VbqCQ0mg1rJEhOqTkvrjuXs4O1VsCNj1JMKA1aYw8F8=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGLL4Ki/fL+Bg4TopuGq+Qsr/pZPdnu1RD3vxr6WA0W4SK /eX3cdNO0pZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACayOpHhv9/8zeciRWYpnql9 9V3iYdmjlml/v9SzNlz0Vf/VfennsecM/0t8Xh1w+iTDs5thVd2OMzd5foi4pWZtnjFzN0/e6cf 7LVgB X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: 8bit commit 9634cb35af17019baec21ca648516ce376fa10e6 upstream. 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 [ applied to net/mptcp/pm_netlink.c instead of upstream's pm_kernel.c ] Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/pm_netlink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 23aef214f30d..d087d5fc3067 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 exit; bh_lock_sock(sk); if (sock_owned_by_user(sk)) { @@ -341,6 +338,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) out: bh_unlock_sock(sk); +exit: __sock_put(sk); } -- 2.53.0