From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794327215; b=VS8EUlo1V1tR2Bs7UkOIVcJWbdGH3BK6SC+0uUVDuOZJRgW096tVy2jn4+herjUDvjo1 RtBf7IBKQ1zK+zs13XSzWRntNYj2QwOA95FlUSQUNL/OTdmLjxfibaPrLw1u3N68eMxGf oU3JcUQeiSbTuaViU/lfqdaKzLH9M+6huXg+ebImdeKS2sgjQ7PVclXqeGsFS5qEvAFpO 0qt8/anH3n+bayAC528NzjlR6zUIq4KOLXSjJY8VkRJisxctyx6BxN4n+XCkdSlFXKysa BpxSeZB9P2LAoti4jvMhWxNdsPgNHcbb2anYf1CNkG7BCTCx7WXW84BXnYdU+XAHJRw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794327215; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=c31tdgNKmMgfks+Y190mkeuAG/DpQvK09mT9nrS5WLQ=; b=A2iVYfTDxtTxXbTdhkVzb3GRNbwyBV8a4Uc6bHEpFr5rvi65EZkXR8BiLssCYYj6s12+ GVH74cjcVskN+2qw26BT2MnsRmPTuAgyJ2htjR+v0SaIniZ8hRtY1/NO5gmrAtKDVtjRr QeZHElPcgMMY/5sc7Vjizl7gLx5Q5C6zonzV9zRzgFY8D/+I8a6qIXMRHViANu6mBCvaT PYiMuRPh+ZV9amsjfAi2rXHsAl3lJ5ivz0HblFQeGte5GMgFoP4iFfCldaAEUSM7zFFXh emGv7s4E4igiIogZfMW785Y/bmCBo/ScR94nK73dY0W1qy6NgzMXipVqhKN9wNJSkWw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=M6yOMcW+; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66765606A31C for ; Tue, 10 Nov 2026 16:13:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=M6yOMcW+ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F57F1F008A1; Tue, 10 Nov 2026 16:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794327213; bh=c31tdgNKmMgfks+Y190mkeuAG/DpQvK09mT9nrS5WLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M6yOMcW+XEnWpCv4DYY5rypnPPwVemgnIo/lKpNNAF/GvcVpiWbureDNQUx09Hw4z SEpKFQ37YevalpDMWj8oww0IGDNvszM6jDjnQGmwK5/FaNVekRdAhTkg7Tn/+ovQci kvWDly9XUhbWQS4q2Q6yC5f+skPvQu4I13FLsNfTf1CnoN8n6U3+BM1zetKhCP2q5H NHdmS4A+8bwnx7vBHEwAjzzAE2YJPayUmVO1m7CXurmWT4G6ymcBq9JKyRYVubxFtE 3gMG8BKpr3JO+33AdqqLLgN8rg6R11IlDfUbPzscivoVrsyMWgBEFsBRnXDuB3HP8N SbXdYtasDjxVA== From: Sasha Levin To: stable@vger.kernel.org Cc: Jun Yang , stable@kernel.org, TencentOS Corvus AI , Xin Long , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y 2/2] sctp: re-point retained control chunks on association migration Date: Tue, 10 Nov 2026 11:13:30 -0500 Message-ID: <20261110161323.2411320-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110161323.2411320-1-sashal@kernel.org> References: <20261107055009-failed-6.1-52ffeaa358d1@kernel.org> <20261110161323.2411320-1-sashal@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jun Yang [ Upstream commit 52ffeaa358d1f3d91aa87a26ad90d77769cff74b ] sctp_sock_migrate() transfers DATA chunk ownership but leaves retained control chunks pointing at the old socket. A later retransmission can therefore access the socket after it has been freed. Extend the migration walk to cover retained control chunks and use sctp_control_set_owner_w() to assign their new owner. Reuse the DATA ownership check so each chunk is processed once per pass, even when it is reachable through multiple lists or retained pointers. Preserve a control chunk's existing authentication key across migration so its final release can still generate SCTP_AUTH_FREE_KEY when needed. Fixes: d04adf1b3551 ("sctp: reset owner sk for data chunks on out queues when migrating a sock") Cc: stable@kernel.org Reported-by: TencentOS Corvus AI Signed-off-by: Jun Yang Acked-by: Xin Long Link: https://patch.msgid.link/20261009074244.3718-3-juny24602@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/net/sctp/sm.h | 1 + net/sctp/sm_make_chunk.c | 5 ++-- net/sctp/socket.c | 53 ++++++++++++++++++++++++++++++---------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index f37c7a558d6dd..0355dbef9881d 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h @@ -256,6 +256,7 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, struct sctp_fwdtsn_skip *skiplist); struct sctp_chunk *sctp_make_auth(const struct sctp_association *asoc, __u16 key_id); +void sctp_control_set_owner_w(struct sctp_chunk *chunk); struct sctp_chunk *sctp_make_strreset_req(const struct sctp_association *asoc, __u16 stream_num, __be16 *stream_list, bool out, bool in); diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 4f3133bd649a9..521c0ab4d4da1 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -95,7 +95,7 @@ static void sctp_control_release_owner(struct sk_buff *skb) } } -static void sctp_control_set_owner_w(struct sctp_chunk *chunk) +void sctp_control_set_owner_w(struct sctp_chunk *chunk) { struct sctp_association *asoc = chunk->asoc; struct sk_buff *skb = chunk->skb; @@ -108,7 +108,8 @@ static void sctp_control_set_owner_w(struct sctp_chunk *chunk) * For now don't do anything for now. */ if (chunk->auth) { - chunk->shkey = asoc->shkey; + if (!chunk->shkey) + chunk->shkey = asoc->shkey; sctp_auth_shkey_hold(chunk->shkey); } skb->sk = asoc ? asoc->base.sk : NULL; diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 04c3b8a8d2dd2..6b24b4fe7b396 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -155,9 +155,24 @@ static void sctp_clear_owner_w(struct sctp_chunk *chunk) static void sctp_set_owner_w_migrate(struct sctp_chunk *chunk) { - sctp_set_owner_w(chunk); - if (chunk->shkey) - sctp_auth_shkey_release(chunk->shkey); + struct sctp_shared_key *shkey = chunk->shkey; + + if (chunk->msg) + sctp_set_owner_w(chunk); + else + sctp_control_set_owner_w(chunk); + + if (shkey) + sctp_auth_shkey_release(shkey); +} + +static void sctp_process_tx_chunk(struct sctp_association *asoc, + struct sctp_chunk *chunk, bool clear, + void (*cb)(struct sctp_chunk *)) +{ + if ((clear && asoc->base.sk == chunk->skb->sk) || + (!clear && asoc->base.sk != chunk->skb->sk)) + cb(chunk); } #define traverse_and_process() \ @@ -165,17 +180,14 @@ do { \ msg = chunk->msg; \ if (msg == prev_msg) \ continue; \ - list_for_each_entry(c, &msg->chunks, frag_list) { \ - if ((clear && asoc->base.sk == c->skb->sk) || \ - (!clear && asoc->base.sk != c->skb->sk)) \ - cb(c); \ - } \ + list_for_each_entry(c, &msg->chunks, frag_list) \ + sctp_process_tx_chunk(asoc, c, clear, cb); \ prev_msg = msg; \ } while (0) -static void sctp_for_each_tx_datachunk(struct sctp_association *asoc, - bool clear, - void (*cb)(struct sctp_chunk *)) +static void sctp_for_each_tx_chunk(struct sctp_association *asoc, + bool clear, + void (*cb)(struct sctp_chunk *)) { struct sctp_datamsg *msg, *prev_msg = NULL; @@ -198,6 +210,21 @@ static void sctp_for_each_tx_datachunk(struct sctp_association *asoc, list_for_each_entry(chunk, &q->out_chunk_list, list) traverse_and_process(); + + list_for_each_entry(chunk, &q->control_chunk_list, list) + sctp_process_tx_chunk(asoc, chunk, clear, cb); + + list_for_each_entry(chunk, &asoc->asconf_ack_list, transmitted_list) + sctp_process_tx_chunk(asoc, chunk, clear, cb); + + list_for_each_entry(chunk, &asoc->addip_chunk_list, list) + sctp_process_tx_chunk(asoc, chunk, clear, cb); + + if (asoc->strreset_chunk) + sctp_process_tx_chunk(asoc, asoc->strreset_chunk, clear, cb); + + if (asoc->addip_last_asconf) + sctp_process_tx_chunk(asoc, asoc->addip_last_asconf, clear, cb); } static void sctp_for_each_rx_skb(struct sctp_association *asoc, struct sock *sk, @@ -9700,9 +9727,9 @@ static int sctp_sock_migrate(struct sock *oldsk, struct sock *newsk, * paths won't try to lock it and then oldsk. */ lock_sock_nested(newsk, SINGLE_DEPTH_NESTING); - sctp_for_each_tx_datachunk(assoc, true, sctp_clear_owner_w); + sctp_for_each_tx_chunk(assoc, true, sctp_clear_owner_w); sctp_assoc_migrate(assoc, newsk); - sctp_for_each_tx_datachunk(assoc, false, sctp_set_owner_w_migrate); + sctp_for_each_tx_chunk(assoc, false, sctp_set_owner_w_migrate); /* If the association on the newsk is already closed before accept() * is called, set RCV_SHUTDOWN flag. -- 2.53.0