From nobody Tue Feb 22 22:58:31 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 589D319E9BCF; Tue, 22 Feb 2022 22:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3F2b1jGVz3mM0; Tue, 22 Feb 2022 22:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fc7PAPo0fRLQv6BiQ4gVcuDqlkWfd10tekxfaukNYRI=; b=LVdZOg+OuxaXQ1Nd8SGw7GyhjMk2rArLaE9u5ltshzK8FCMuCi16b6eBuQ9QRdLG21aaIc QDlQ2O/FdbKlhpcTBU537BNpsN0xf+znDiy0r7Q/09QgmKhDnhye2BQk9R3QpwafzZk2SY JqDaaTBsd/LhtgJI/L3bAU7sOOXF8nY5Ah1gtPKACldmmLLT81XPX0ewE5wrAZQ6ruvI2o zput9XTsj1pCnuzXdOvAOxzrWFPNJ4jLI2BYtVO1H0b2YMWCMg6xTg+YL46PHCSy0za/Zy q7ampBkBn2iTzCD3b5YeEKBhAlVjAtmPiEH114npDwPE+Ll4yFKMNq2DeTLsdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A5244FBB; Tue, 22 Feb 2022 22:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21MMwVwr070394; Tue, 22 Feb 2022 22:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMwV1q070393; Tue, 22 Feb 2022 22:58:31 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:58:31 GMT Message-Id: <202202222258.21MMwV1q070393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 932fc0590154 - stable/13 - sctp: provide a specific stream scheduler function for FCFS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 932fc0590154d805699ad676f35a6a1202555f01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fc7PAPo0fRLQv6BiQ4gVcuDqlkWfd10tekxfaukNYRI=; b=BUbKX+4A2GO1tGZk8/Rez2yKFUJ+aiVgiLcs9iQVdtLId+XYyF7fqnuy0Gw5TASix31X1k lRBEAk9Gcnz9IYKzei+RF4tjMPzYPT5s0MokRR6QLIJyJebR1XPuth+mOro1JG+KEKz05g GkZ+Og8rl0x4is+FTw+ruRIcjbWRXmpOEpg/md3YQkBv0tnvnGJm6n/XLPUbylt9mkei2T yvRuhZUXzc62XYsIx3QTj39g1TbmDAiM8NsQCIOzs1tO+/t0kQbgnIkHRiyzyCw2i04x02 2cIRfunDy1tHjDf9mJn2LB8S4SUpvg3vtWO8nB74nlp1Yg8owi+tvgRaDXa0Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645570711; a=rsa-sha256; cv=none; b=G9K8cZX1J4TtLW99YkEixsTDRUyRFmj0aWlz+xWh9QuCxnN7mfCLZ5Ue4s/LkWeonezPdP /BZ2lLEtif1Hq5DYPjTK/sXokvlfwi1HBpUhThICx/usaD5FgvgjaVDb/fN55BD5SN50jg awhpmBT8pgL02nAtx3O4u0g1VbEzJkOSENQmCzaMmPFbAVNQvyU8XDj4NOWaVPCoHJ8q11 Xn1FZ7LqCz+9JoJ0c6+eOBqrB/JvVdm7BzSeWR4dPYo7EeR6EdJbiScCY96QXbfmtqsVtA IO6wD6tVJhx3FwlAbQTvNrrFzff3HlZ+y3QgKKiCMTDNivHVCyR1+BA3mRLwcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=932fc0590154d805699ad676f35a6a1202555f01 commit 932fc0590154d805699ad676f35a6a1202555f01 Author: Michael Tuexen AuthorDate: 2021-09-29 00:08:37 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:58:10 +0000 sctp: provide a specific stream scheduler function for FCFS A KASSERT in the genric routine does not apply and triggers incorrectly. Reported by: syzbot+8435af157238c6a11430@syzkaller.appspotmail.com (cherry picked from commit 28ea9470782d4d01004b801c3ec7d74761fcf611) --- sys/netinet/sctp_ss_functions.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c index fe4b96cf00ab..5293c0fee742 100644 --- a/sys/netinet/sctp_ss_functions.c +++ b/sys/netinet/sctp_ss_functions.c @@ -863,6 +863,30 @@ default_again: return (strq); } +static void +sctp_ss_fcfs_scheduled(struct sctp_tcb *stcb, + struct sctp_nets *net SCTP_UNUSED, + struct sctp_association *asoc, + struct sctp_stream_out *strq, + int moved_how_much SCTP_UNUSED) +{ + struct sctp_stream_queue_pending *sp; + + KASSERT(strq != NULL, ("strq is NULL")); + asoc->ss_data.last_out_stream = strq; + if (asoc->idata_supported == 0) { + sp = TAILQ_FIRST(&strq->outqueue); + if ((sp != NULL) && (sp->some_taken == 1)) { + asoc->ss_data.locked_on_sending = strq; + } else { + asoc->ss_data.locked_on_sending = NULL; + } + } else { + asoc->ss_data.locked_on_sending = NULL; + } + return; +} + const struct sctp_ss_functions sctp_ss_functions[] = { /* SCTP_SS_DEFAULT */ { @@ -948,7 +972,7 @@ const struct sctp_ss_functions sctp_ss_functions[] = { .sctp_ss_is_empty = sctp_ss_fcfs_is_empty, .sctp_ss_remove_from_stream = sctp_ss_fcfs_remove, .sctp_ss_select_stream = sctp_ss_fcfs_select, - .sctp_ss_scheduled = sctp_ss_default_scheduled, + .sctp_ss_scheduled = sctp_ss_fcfs_scheduled, .sctp_ss_packet_done = sctp_ss_default_packet_done, .sctp_ss_get_value = sctp_ss_default_get_value, .sctp_ss_set_value = sctp_ss_default_set_value,