From nobody Tue Feb 22 22:51:53 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 760B019E6C55; Tue, 22 Feb 2022 22:51:54 +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 4K3Dty1Kb6z3RLR; Tue, 22 Feb 2022 22:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570314; 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=z0AALhwrtt7f49qllaAaeMwNSad2e4wOHl04Us2xdcc=; b=wm7oyezVktv5SsIGOmV2oHx8eSopaA86szMn0bqiySaDft+at0y+Q9sD6PZFRktANZHaIK 9VwLp3LUd4rze1CczpJiwcCqH9Pkw2blPGrb10+SxBSE6/YhbiI/vpg3ZgoTvMrQ+GHDZC aDEdox8V+HpmZJF/6wR3E+HCTHc2m/YMEcc19YlmShVE2eHBFWdA1LkNsHItbTMY0cmrOJ KWGScGn/LhMJ4o9AbGcPXngjRt2/ddoMVBs1chGcAASclm3EvNAYipVh23YJIyRZBVCREs tr3uDFeYWnn5jzkzJqARrDuYZiDYVCHiGecCMFUT4DQCKq3MesJ6WaHaiF4E0Q== 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 83D5A49E9; Tue, 22 Feb 2022 22:51:53 +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 21MMprF6068285; Tue, 22 Feb 2022 22:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMprmj068284; Tue, 22 Feb 2022 22:51:53 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:51:53 GMT Message-Id: <202202222251.21MMprmj068284@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: c05bf58603b0 - stable/13 - sctp: fix FCFS stream scheduler 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: c05bf58603b0ddfb532636e12538925f1cb022c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570314; 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=z0AALhwrtt7f49qllaAaeMwNSad2e4wOHl04Us2xdcc=; b=By9R2tMhDxMvKIRZnxdXKBU3QIF2TzScixNp4gYoHZa+Trtqf3pDgzQ7g4Dyhrb58X3/yd a8Kb5wbYxEs/rCSSiGezLJudxMYHdFONv9mBl+rPLpr0SyK/50B/IUvkJwYZ+h8QK8kbZ6 1wFbuX7DutEZ+DOyGAJQJk/jdqq9S+ieW9N+400/xyrvyKgeJvOuEy7bN+lkytER+uW20y po3iwBsJb55SnSrPugqah2XWLZXKb5/faaGtR5PZLPHKkUfY9bDBqJBrcOm6fKJ9mHavdX ZCJUgyF8RIu4miOSjNnANhFCIyVzIsBDWX5ffhgBJvXONBVKFlB+1bBfD8bAIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645570314; a=rsa-sha256; cv=none; b=PofYw75QdvfNhoddJBvBzlTsh+mm3dxsu+ZBCbLK88Dxd5vqPatKdVCnXKgoa/8LgJ1wlN vSiqPQiattDhp9eXfyvcWP3lktf+5AIrmcuvu2YoHf8IC2+l6lozyoAFtozJFM2fmfR+qk 70wNtr7wck8QNMkdDidHPfHPQw35p/uxIO+hgf0uRJqJ+KhnP9LsORahBASPfR9KZ2Jgy/ RYToIwV8mdO1hfSKwwrp/fT7mb/IZv7b8SANr0HXTWMQEMCHaYXxKi2VMCtDccqYtQ1lBq B+cUKIleKP0/0VhTUN43JWidQ8S/Ipy7fvD2JzrC0XuKZSziMrOlzj9r1D0e0A== 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=c05bf58603b0ddfb532636e12538925f1cb022c5 commit c05bf58603b0ddfb532636e12538925f1cb022c5 Author: Michael Tuexen AuthorDate: 2021-09-19 09:56:26 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:51:26 +0000 sctp: fix FCFS stream scheduler Reported by: syzbot+c6793f0f0ce698bce230@syzkaller.appspotmail.com (cherry picked from commit e19d93b19dce276bdf178bb6a449728238d1c6f8) --- sys/netinet/sctp_ss_functions.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c index 5557015cd2a9..0a5a788428bc 100644 --- a/sys/netinet/sctp_ss_functions.c +++ b/sys/netinet/sctp_ss_functions.c @@ -809,23 +809,22 @@ sctp_ss_fcfs_init(struct sctp_tcb *stcb, struct sctp_association *asoc, static void sctp_ss_fcfs_clear(struct sctp_tcb *stcb, struct sctp_association *asoc, - int clear_values, int holds_lock) + int clear_values SCTP_UNUSED, int holds_lock) { struct sctp_stream_queue_pending *sp; - if (clear_values) { - if (holds_lock == 0) { - SCTP_TCB_SEND_LOCK(stcb); - } - while (!TAILQ_EMPTY(&asoc->ss_data.out.list)) { - sp = TAILQ_FIRST(&asoc->ss_data.out.list); - TAILQ_REMOVE(&asoc->ss_data.out.list, sp, ss_next); - sp->ss_next.tqe_next = NULL; - sp->ss_next.tqe_prev = NULL; - } - if (holds_lock == 0) { - SCTP_TCB_SEND_UNLOCK(stcb); - } + if (holds_lock == 0) { + SCTP_TCB_SEND_LOCK(stcb); + } + while (!TAILQ_EMPTY(&asoc->ss_data.out.list)) { + sp = TAILQ_FIRST(&asoc->ss_data.out.list); + TAILQ_REMOVE(&asoc->ss_data.out.list, sp, ss_next); + sp->ss_next.tqe_next = NULL; + sp->ss_next.tqe_prev = NULL; + } + asoc->ss_data.last_out_stream = NULL; + if (holds_lock == 0) { + SCTP_TCB_SEND_UNLOCK(stcb); } return; }