Skip to content

[ciqlts8_6] Multiple patches tested (2 commits) #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PlaidCat merged 2 commits into from
Sep 10, 2026
Merged

[ciqlts8_6] Multiple patches tested (2 commits) #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d625f4a
sctp: purge outqueue on stale COOKIE-ECHO handling
shreeya-patel98 Sep 9, 2026
f6c11ee
sctp: stream: fully roll back denied add-stream state
shreeya-patel98 Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions net/sctp/sm_statefuns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,11 +2596,7 @@ static enum sctp_disposition sctp_sf_do_5_2_6_stale(
*/
sctp_add_cmd_sf(commands, SCTP_CMD_DEL_NON_PRIMARY, SCTP_NULL());

/* If we've sent any data bundled with COOKIE-ECHO we will need to
* resend
*/
sctp_add_cmd_sf(commands, SCTP_CMD_T1_RETRAN,
SCTP_TRANSPORT(asoc->peer.primary_path));
sctp_add_cmd_sf(commands, SCTP_CMD_PURGE_OUTQUEUE, SCTP_NULL());

/* Cast away the const modifier, as we want to just
* rerun it through as a sideffect.
Expand Down
6 changes: 5 additions & 1 deletion net/sctp/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,7 @@ struct sctp_chunk *sctp_process_strreset_resp(
stsn, rtsn, GFP_ATOMIC);
} else if (req->type == SCTP_PARAM_RESET_ADD_OUT_STREAMS) {
struct sctp_strreset_addstrm *addstrm;
const struct sctp_sched_ops *sched;
__u16 number;

addstrm = (struct sctp_strreset_addstrm *)req;
Expand All @@ -1086,7 +1087,10 @@ struct sctp_chunk *sctp_process_strreset_resp(
for (i = number; i < stream->outcnt; i++)
SCTP_SO(stream, i)->state = SCTP_STREAM_OPEN;
} else {
sctp_stream_shrink_out(stream, number);
sched = sctp_sched_ops_from_stream(stream);
sched->unsched_all(stream);
sctp_stream_outq_migrate(stream, NULL, number);
sched->sched_all(stream);
stream->outcnt = number;
}

Expand Down
Loading