From nobody Wed Feb 1 22:41:44 2023 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 4P6cNS5ytgz3cF4F; Wed, 1 Feb 2023 22:41:44 +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 4P6cNS5WnQz4Lgw; Wed, 1 Feb 2023 22:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291304; 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=adCDJUIhYhOvSpMn8IFO6SlGp1MTYE+4/Cd3RoZIOJk=; b=IGrc9cGGtfo5iqe0TmFXPL+nPfuWSdQ2TQOS3kqlkAnoy3y4p2wZbj7/hSsgE59BHyQImg nm/aPY28CROcaWKvUGcEumql6qTY8jYayV4je0XiW/uMLU8VqC14Uz5hFFwf8wLh3obnF1 kzlITew3HofCVE7IGDrevnYcOcxXsWI3vg3/A49xp2TaRdoxmgueM9KgoxL0CIXhc8ULHc n0v6wD063hVy2rj4M7FYMJ+UKTFPng+FqVt7uaCygu5APzwSuMa+e7HQOy+6cKAv4Ex8xZ 5SSIkJHvBpDAoRii0hbWNvy7ZK6w2GGJxRMGpeD4cJ7jx0WNE1XPOoap9AE1aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291304; 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=adCDJUIhYhOvSpMn8IFO6SlGp1MTYE+4/Cd3RoZIOJk=; b=TInUNINrFXSElDcW+ltgyG1Uq/7Elax9MIoGLJJC04OPIPx/aoGkSiNBnojfojo4IkgTEL mm0oPmQcCRioBWwZvMnkcLhEgK95UrgUkkzFvcbLWaDprLNpu4IllPkZ4mcSAYMkeeCieS WQrImOo7lEhmmlFgkjGpRUVsCYgSTNXN0+s2ykkN35A9xKyhDoeG1Y/34I2B/dD1VYvCdb XhlRWW2e/gbWWPd/INYFuIDDDL1uCSEWu1cH9n6x3vorWiRhHo2Um08ikeSQ5arjvCW9/O 2QXobA11bk+JQQRxp9JHWe6S0kVKUitcleZ9ermLaXpQ05l7fPYjSWyHwCP44A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291304; a=rsa-sha256; cv=none; b=q5hGt+SCme/dCfAEeAstk3ZSa41bBePno8ZHcS0xsdFtFqCs4e3INwZSB0L3xjWM7sjSto E1MK8upI7U9fABr9b5sRXD2xoQXeB2DvW6OMSxWZCXtPKGdbBHXjfZlhoaYrkoYfzzISSc TmbEGby7ppz6E2yL1LRQOpzpzybQpa0E1vqmWBjCnreoNqo5In1bQCXtoPUPi/benpZ+tA VdLJh7YBwb330ExExlHG/qlcQFngV2I2AQAMwZS/43GSoUpEzFFfy7DDAkRKNmlTDwHQzb v9x18S8GFB7uVnmlzQsMGVOaIp4vwEtHnvbyEuoQ1Ff53zQoPDeJE7OHAS01jQ== 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 4P6cNS4bKzzX0P; Wed, 1 Feb 2023 22:41:44 +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 311MfiCH000518; Wed, 1 Feb 2023 22:41:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MficF000517; Wed, 1 Feb 2023 22:41:44 GMT (envelope-from git) Date: Wed, 1 Feb 2023 22:41:44 GMT Message-Id: <202302012241.311MficF000517@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: c2b0f069c42c - stable/13 - sctp: don't keep a pointer to a freed stcb around 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: c2b0f069c42ccd4111db78b85aad9c3cd543bb08 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b0f069c42ccd4111db78b85aad9c3cd543bb08 commit c2b0f069c42ccd4111db78b85aad9c3cd543bb08 Author: Michael Tuexen AuthorDate: 2022-04-15 12:00:00 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 22:41:21 +0000 sctp: don't keep a pointer to a freed stcb around Reported by: syzbot+b9ef06efdae7cb9ee414@syzkaller.appspotmail.com Reported by: syzbot+b1e4793e0e6b25b0d510@syzkaller.appspotmail.com (cherry picked from commit eeba222172170c380450004fdceac80c3612b1e8) --- sys/netinet/sctp_pcb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 9d9760bd0e86..ee1ff6bd56d9 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -3371,8 +3371,10 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) cnt_in_sd = 0; LIST_FOREACH_SAFE(stcb, &inp->sctp_asoc_list, sctp_tcblist, nstcb) { SCTP_TCB_LOCK(stcb); + /* Disconnect the socket please. */ + stcb->sctp_socket = NULL; + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET); if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { - stcb->sctp_socket = NULL; /* Skip guys being freed */ cnt_in_sd++; if (stcb->asoc.state & SCTP_STATE_IN_ACCEPT_QUEUE) { @@ -3404,9 +3406,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) } continue; } - /* Disconnect the socket please */ - stcb->sctp_socket = NULL; - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_CLOSED_SOCKET); if ((stcb->asoc.size_on_reasm_queue > 0) || (stcb->asoc.control_pdapi) || (stcb->asoc.size_on_all_streams > 0) ||