sctp: handle wrapped and duplicate RECONF responses
Subsystems (3)
v4 cover sctp: handle wrapped and duplicate RECONF responses
From: Jun Yang <[email protected]>
Fix response sequence zero lookup first, then make RECONF response handling idempotent with an outstanding-request bitmask.
Jun Yang (2):
sctp: distinguish sequence zero from wildcard in reconf lookup
sctp: fix stream->outcnt underflow on duplicate RECONF responses
include/net/sctp/structs.h | 2 +- net/sctp/stream.c | 46 ++++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 15 deletions(-)
---
Changes since v3:
- Restore the SCTP_STRRESET_SET/CLEAR/TEST() helpers.
v2: https://lore.kernel.org/netdev/[email protected]/
--
2.55.0
PATCH v4 1/2 sctp: distinguish sequence zero from wildcard in reconf lookup
From: Jun Yang <[email protected]>
Zero is a valid response sequence after strreset_outseq wraps, but sctp_chunk_lookup_strreset_param() currently treats it as a wildcard.
Add match_seq so response lookups match zero exactly while the one type-only lookup can still ignore the sequence.
--- net/sctp/stream.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/sctp/stream.c +6 -5
@@ -482,7 +482,7 @@ int sctp_send_add_streams(struct sctp_association *asoc,static struct sctp_paramhdr *sctp_chunk_lookup_strreset_param (struct sctp_association *asoc,__be32 resp_seq, -__be16 type) +__be16 type,bool match_seq) {struct sctp_chunk *chunk = asoc->strreset_chunk;struct sctp_reconf_chunk *hdr;
@@ -499,7 +499,7 @@ static struct sctp_paramhdr *sctp_chunk_lookup_strreset_param(*/ struct sctp_strreset_tsnreq *req = param.v; -if ((!resp_seq || req->request_seq == resp_seq) && +if ((!match_seq || req->request_seq == resp_seq) && (!type || type == req->param_hdr.type))return param.v; }
@@ -564,7 +564,7 @@ struct sctp_chunk *sctp_process_strreset_outreq(if (asoc->strreset_chunk) {if (!sctp_chunk_lookup_strreset_param ( asoc, outreq->response_seq, -SCTP_PARAM_RESET_IN_REQUEST )) { +SCTP_PARAM_RESET_IN_REQUEST , true)) {/* same process with outstanding isn't 0 */ result =SCTP_STRRESET_ERR_IN_PROGRESS ; goto out;
@@ -816,7 +816,7 @@ struct sctp_chunk *sctp_process_strreset_addstrm_out(if (asoc->strreset_chunk) {if (!sctp_chunk_lookup_strreset_param ( - asoc,0 ,SCTP_PARAM_RESET_ADD_IN_STREAMS )) { + asoc,0 ,SCTP_PARAM_RESET_ADD_IN_STREAMS , false)) {/* same process with outstanding isn't 0 */ result =SCTP_STRRESET_ERR_IN_PROGRESS ; goto out;
@@ -927,7 +927,8 @@ struct sctp_chunk *sctp_process_strreset_resp(struct sctp_paramhdr *req;__u32 result; - req =sctp_chunk_lookup_strreset_param (asoc, resp->response_seq,0 ); + req =sctp_chunk_lookup_strreset_param (asoc, resp->response_seq,0 , + true);if (!req)return NULL ;
Signature · 1 line
2.55.0
PATCH v4 2/2 sctp: fix stream->outcnt underflow on duplicate RECONF responses
In reply to Jun YangFrom: Jun Yang <[email protected]>
A cached RECONF chunk may contain more than one request parameter. A duplicate response can therefore find and process the same ADD_OUT request again while another parameter is still outstanding, rolling back outcnt twice and possibly underflowing it.
Track outstanding request types as bits and clear each bit after its first response. Later responses for the same request are then ignored.
---
v4:
- Restore the SCTP_STRRESET_SET/CLEAR/TEST() helpers, each of which is used more than once, so open-coding them only adds lines.
v3:
- Split the response_seq == 0 lookup fix into patch 1 (Simon Horman).
- Keep the request bit helper local to stream.c.
v2:
- Track outstanding requests by type instead of sequence (Xin Long).
- Drop the redundant arithmetic guard (Xin Long).
v1: https://lore.kernel.org/netdev/[email protected]/
include/net/sctp/structs.h | 2 +- net/sctp/stream.c | 39 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 12 deletions(-)
include/net/sctp/structs.h +1 -1
@@ -2057,7 +2057,7 @@ struct sctp_association { force_delay:1 ;__u8 strreset_enable; -__u8 strreset_outstanding;/* request param count on the fly */ +__u8 strreset_outstanding;/* request param bitmask on the fly */ __u32 strreset_outseq;/* Update after receiving response */ __u32 strreset_inseq;/* Update after receiving request */
net/sctp/stream.c +28 -11
@@ -22,6 +22,15 @@#include <net/sctp/sm.h> #include <net/sctp/stream_sched.h> +#define SCTP_STRRESET_MASK (type) \ + BIT(ntohs(type) - ntohs(SCTP_PARAM_RESET_OUT_REQUEST)) +#define SCTP_STRRESET_TEST (asoc, type) \ + ((asoc)->strreset_outstanding & SCTP_STRRESET_MASK(type)) +#define SCTP_STRRESET_SET (asoc, type) \ + ((asoc)->strreset_outstanding |= SCTP_STRRESET_MASK(type)) +#define SCTP_STRRESET_CLEAR (asoc, type) \ + ((asoc)->strreset_outstanding &= ~SCTP_STRRESET_MASK(type)) +static void sctp_stream_shrink_out (struct sctp_stream *stream,__u16 outcnt) {struct sctp_association *asoc;
@@ -372,7 +381,10 @@ int sctp_send_reset_streams(struct sctp_association *asoc, goto out; } - asoc->strreset_outstanding = out + in; +if (out) +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_OUT_REQUEST ); +if (in) +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_IN_REQUEST ); out:return retval;
@@ -417,7 +429,7 @@ int sctp_send_reset_assoc(struct sctp_association *asoc)return retval; } - asoc->strreset_outstanding =1 ; +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_TSN_REQUEST );return 0 ; }
@@ -474,7 +486,10 @@ int sctp_send_add_streams(struct sctp_association *asoc, goto out; } - asoc->strreset_outstanding = !!out + !!in; +if (out) +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_ADD_OUT_STREAMS ); +if (in) +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_ADD_IN_STREAMS ); out:return retval;
@@ -564,13 +579,14 @@ struct sctp_chunk *sctp_process_strreset_outreq(if (asoc->strreset_chunk) {if (!sctp_chunk_lookup_strreset_param ( asoc, outreq->response_seq, -SCTP_PARAM_RESET_IN_REQUEST , true)) { +SCTP_PARAM_RESET_IN_REQUEST , true) || + !SCTP_STRRESET_TEST (asoc,SCTP_PARAM_RESET_IN_REQUEST )) {/* same process with outstanding isn't 0 */ result =SCTP_STRRESET_ERR_IN_PROGRESS ; goto out; } - asoc->strreset_outstanding--; +SCTP_STRRESET_CLEAR (asoc,SCTP_PARAM_RESET_IN_REQUEST ); asoc->strreset_outseq++;if (!asoc->strreset_outstanding) {
@@ -669,7 +685,7 @@ struct sctp_chunk *sctp_process_strreset_inreq(SCTP_SO (stream, i)->state =SCTP_STREAM_CLOSED ; asoc->strreset_chunk = chunk; - asoc->strreset_outstanding =1 ; +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_OUT_REQUEST );sctp_chunk_hold (asoc->strreset_chunk); result =SCTP_STRRESET_PERFORMED ;
@@ -816,13 +832,14 @@ struct sctp_chunk *sctp_process_strreset_addstrm_out(if (asoc->strreset_chunk) {if (!sctp_chunk_lookup_strreset_param ( - asoc,0 ,SCTP_PARAM_RESET_ADD_IN_STREAMS , false)) { + asoc,0 ,SCTP_PARAM_RESET_ADD_IN_STREAMS , false) || + !SCTP_STRRESET_TEST (asoc,SCTP_PARAM_RESET_ADD_IN_STREAMS )) {/* same process with outstanding isn't 0 */ result =SCTP_STRRESET_ERR_IN_PROGRESS ; goto out; } - asoc->strreset_outstanding--; +SCTP_STRRESET_CLEAR (asoc,SCTP_PARAM_RESET_ADD_IN_STREAMS ); asoc->strreset_outseq++;if (!asoc->strreset_outstanding) {
@@ -899,7 +916,7 @@ struct sctp_chunk *sctp_process_strreset_addstrm_in( goto out; asoc->strreset_chunk = chunk; - asoc->strreset_outstanding =1 ; +SCTP_STRRESET_SET (asoc,SCTP_PARAM_RESET_ADD_OUT_STREAMS );sctp_chunk_hold (asoc->strreset_chunk); stream->outcnt = outcnt;
@@ -929,7 +946,7 @@ struct sctp_chunk *sctp_process_strreset_resp( req =sctp_chunk_lookup_strreset_param (asoc, resp->response_seq,0 , true); -if (!req) +if (!req || !SCTP_STRRESET_TEST (asoc, req->type))return NULL ; result =ntohl (resp->result);
@@ -1079,7 +1096,7 @@ struct sctp_chunk *sctp_process_strreset_resp( nums, 0, GFP_ATOMIC); } - asoc->strreset_outstanding--; +SCTP_STRRESET_CLEAR (asoc, req->type); asoc->strreset_outseq++;/* remove everything for this reconf request */
Signature · 1 line
2.55.0
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Mon, 24 Aug 2026 16:18:18 +0800 you wrote:
From: Jun Yang <[email protected]>
Fix response sequence zero lookup first, then make RECONF response handling idempotent with an outstanding-request bitmask.
Jun Yang (2):
sctp: distinguish sequence zero from wildcard in reconf lookup
sctp: fixstream->outcntunderflow on duplicate RECONF responses[...]
Here is the summary with links:
- [net,v4,1/2] sctp: distinguish sequence zero from wildcard in reconf lookup
https://git.kernel.org/netdev/net/c/63f44178f0a0 - [net,v4,2/2] sctp: fix stream->outcnt underflow on duplicate RECONF responses https://git.kernel.org/netdev/net/c/3faf13aff243
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html