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=1794326253; b=ShpIZI5VDnCZeng7Z3fwy8PLOXxT34A0C8IP0lIfFFhfQpww4zaVqTxpeinWY6yNCJRP /bsjn+KEo4DccGgkJ9cE9EYLFnMHJZqRE4PakU8B8+OlI/Zn55Vq2dckgZefrt08tk4xH PFjIzjtEBlxfpXrohT4MFTe3txL1rwKULtITzicoFQ37Z/FpA5EsnSj2qhy4CW2ZDYaBN bnBM8nZMR3OnmkOYidtLz7Pv4jvZN8YfctOtI7Zx1pPwU2A7X8QlcEhNhe4My5zJPymwS qn3lJ7pbZT4kdIPJifghX+X/TDxXrfUN2KBOKU+8z2akp1Jt1ti7j82woVVQgevbNeQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794326253; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=i+Z8S9CjxU0Qdj/WGVc+yZAkARB0P6yCU9R0W/gQiV8=; b=T/DqfHTSayqg+HpW1EKABZo3uxDfn+v6B6WAZwBFzAhY54IBLpsihnm7Trp8DupLohi2 rFAgNBXOn0sJyONX1P5y1kYr+aRdCRuAAxOKrWvlk5UbzMqOvfKQ10peJbxz6TG+dhR4I SSZ72L/Os63urUzNZOBf6QlI91TDV78PLWBml5eWB6mVh8BoOrOb13ph49C1QD6N6f/x0 enhEvfQK9Lrz8WiertxYo2J/omwa6urKIxmPYjXornexGDY8XMNrx5TAxmQnmu34WP/4k iB9F5wFgZxvM7gQK/9PipUPkw4vPRtuOdzIiMbrNRV4r4RNJMLr72w33e2DnifR2RyA== 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=Kv1Jx07y; 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 9ECD0606A325 for ; Tue, 10 Nov 2026 15:57:31 +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=Kv1Jx07y Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57F5C1F008A2; Tue, 10 Nov 2026 15:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794326251; bh=i+Z8S9CjxU0Qdj/WGVc+yZAkARB0P6yCU9R0W/gQiV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Kv1Jx07y6S3cxUyrnEsbOgXS+P91dk9sE+RGqlEqqhJr/TCzWt9nO07noTVYFaL01 LJ58PcbCt8GVZD/PhPesmBK4rSFwhptc9Gm9PkiuLit0tzAUSNQ+Fr50BcrY4EgBx0 kVnEXKM/bzCIsx+anllBwa1TJi5HGOVEhX+GDlU0St5m6hd5+w8px8FVxfiWPzS/ob 7xD+ELbOxbvT7r1wDr3gbN4M8En1AosWMYxMffJqevTK/2R++z6h1PG9UZeBC1m4SC D0uqwkTXtQbSnclkDgOGw4Uul9b3a5FP5bakh5tbA/qvZnx+FEHj3iX8gMWoWdZp2J x0tjsHWm1zkzw== 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.18.y 2/2] sctp: re-point retained control chunks on association migration Date: Tue, 10 Nov 2026 10:57:28 -0500 Message-ID: <20261110155720.2371604-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110155720.2371604-1-sashal@kernel.org> References: <20261107051203-failed-6.18-52ffeaa358d1@kernel.org> <20261110155720.2371604-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 3bfd261a53cc9..76605d1ee8391 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h @@ -252,6 +252,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 8e4e88b1d0c06..317ce9ee32549 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -94,7 +94,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; @@ -107,7 +107,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 285cd8e0a1cfe..5cbc364a53576 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -156,9 +156,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() \ @@ -166,17 +181,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; @@ -199,6 +211,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, @@ -9677,9 +9704,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