From nobody Tue Feb 22 22:59:25 2022 X-Original-To: dev-commits-src-all@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 0013A19E9C7F; Tue, 22 Feb 2022 22:59:26 +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 4K3F3d6T0vz3mbL; Tue, 22 Feb 2022 22:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570765; 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=Z35/uVx6UD7ADUN2X5ZVCn6Hd/FJi6puBS5Tmx91Mck=; b=e1bRrM9c1pWAFUszPpmbqMyRBxtpsbyxycpy0bQ2rAYiDXsZ+Bcfb4y98opm+GPlpgnTel xSe0+/7VjSzRW5I9W8Qyn+K0BhjP0XfHNiEbxz/t9pLqypCg0E5M5KJyPeF1VoCg0OyVZp 8Sepc7EirgF1KgzyDaB/3GW6yiS629tiRTDT13pbTqtdqaTW/ghUm5OQMwFGt6xMu9BUPR we2yRUZKl3Og2LRQb7FZs6ArneXMXsMAsMIMRzXlv4mR0ff0KGPTQcuZQWvkzHKx3qEVPQ no8/4VbNKu4kuEqciouwEg1ryj83mxw/lHxks0333P5TesQ/IC41NT6h26fpgA== 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 BE7814BEF; Tue, 22 Feb 2022 22:59:25 +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 21MMxP4I070565; Tue, 22 Feb 2022 22:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMxPxD070564; Tue, 22 Feb 2022 22:59:25 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:59:25 GMT Message-Id: <202202222259.21MMxPxD070564@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: 615ff3cb608f - stable/13 - sctp: don't keep being locked on a stream which is removed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 615ff3cb608f6d127a8b87307b7f14d169ad06f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645570765; 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=Z35/uVx6UD7ADUN2X5ZVCn6Hd/FJi6puBS5Tmx91Mck=; b=B/ut0Inkfu7l3fpbrKzLSUXlrV3DRX0OhEipgsA9J4eL2frToDs8Czb+5iC9jgEQe6Itb0 7+2UavkejRF1lFnSIwui5TCofyztA0GZIkoAhSNy+khCjm7b61C4dAt+k/3n1ndJecHGgp VSS3f8vwkj3U4U9+/082ejUxPaQaPAHYYUkWNA+FObdTAFtMf5cvAA4W5Z1FTVfTD9qDGX huie0ofoby2QpBymX7tId9FEIhnX1vhw0iS/rYw+FPnsCxyuyP7URQ95glfRiSTMRfieHh ROjdp6CTpqMejbrEmKPl0tuuHO/Nf8KyGbH7N8eqJrbAFPF9ecmzBYv04NPXtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645570765; a=rsa-sha256; cv=none; b=ETqt2xKQLBxCMhiyoYsYUMLWouhN2RgYdkZ3VEQMmOMkeL3VdoCap1Kt0523TvTrthWd+E DdthQyHXx3SXQpY2kOD/GU7dF/yQ5jLTTSd6Ll3NPTYPWmzoZm3WVhByIrHQxFrnjuZXG1 jOaNwI2GGg2KqjAIPxJedNCu0WdxjM0ytF6kJhU3JGu5+0lwXN5HlpE4unQCZuncFhxT03 yNFNv/A2RB5QnA93ypNvz0Q43Twp3xWQ/OQb58Y/n8ExyjHe/mNxaZ+piFYIHKqcgTQcp9 moza0MLhkba44rM9IeQA7Lw9cAEHvROTtGa/PiqdZlUgoKIPoRrfiE64ZrUTaw== 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=615ff3cb608f6d127a8b87307b7f14d169ad06f6 commit 615ff3cb608f6d127a8b87307b7f14d169ad06f6 Author: Michael Tuexen AuthorDate: 2021-10-01 22:48:01 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:59:05 +0000 sctp: don't keep being locked on a stream which is removed Reported by: syzbot+f5f551e8a3a0302a4914@syzkaller.appspotmail.com (cherry picked from commit 3ff3733991ba049959c4fd2e7179ea96241a396e) --- sys/netinet/sctp_ss_functions.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c index 5293c0fee742..c08bec07c588 100644 --- a/sys/netinet/sctp_ss_functions.c +++ b/sys/netinet/sctp_ss_functions.c @@ -150,6 +150,9 @@ sctp_ss_default_remove(struct sctp_tcb *stcb, struct sctp_association *asoc, asoc->ss_data.last_out_stream = NULL; } } + if (asoc->ss_data.locked_on_sending == strq) { + asoc->ss_data.locked_on_sending = NULL; + } TAILQ_REMOVE(&asoc->ss_data.out.wheel, strq, ss_params.ss.rr.next_spoke); strq->ss_params.scheduled = false; } @@ -466,6 +469,9 @@ sctp_ss_prio_remove(struct sctp_tcb *stcb, struct sctp_association *asoc, asoc->ss_data.last_out_stream = NULL; } } + if (asoc->ss_data.locked_on_sending == strq) { + asoc->ss_data.locked_on_sending = NULL; + } TAILQ_REMOVE(&asoc->ss_data.out.wheel, strq, ss_params.ss.prio.next_spoke); strq->ss_params.scheduled = false; } @@ -635,6 +641,9 @@ sctp_ss_fb_remove(struct sctp_tcb *stcb, struct sctp_association *asoc, asoc->ss_data.last_out_stream = NULL; } } + if (asoc->ss_data.locked_on_sending == strq) { + asoc->ss_data.locked_on_sending = NULL; + } TAILQ_REMOVE(&asoc->ss_data.out.wheel, strq, ss_params.ss.fb.next_spoke); strq->ss_params.scheduled = false; }