From nobody Mon Feb 06 22:21:04 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 4P9ghK10Vmz3nVFQ; Mon, 6 Feb 2023 22:21:05 +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 4P9ghK0Stfz4H0j; Mon, 6 Feb 2023 22:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722065; 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=W+wyhc1jFX+IxQMA0GHKJumNA9z2fdmohjQ7ku3aEkU=; b=A0Rlzo2pgmL5uzAi8XvP1OpdNzbfcUvbzb7q4YWZ9WxA3Xh/tunYpnSw/Z2Gn9BHa+4rpw rxYaLRt2fbSbQlIuzEdcHgmPnThTwq/zw8Jy7qD5xlLKpbjerS9cH6T20Pyqaxlp6HajOG 7gz6e+r2Z5vc3REQaSg0cyhg3uGdApOksPDp2tH2NRl1ZlRcVmlbjLBDMS5lr6R5U+cN7I H61ZOAxXxxj0nu5fzo+gJmd0dBusJO6p5I9Q9Bt7S8inuoRzdvHWw7k/9LXWxUFC+EhaCp Ls5Qs7KrSTu+jOFafQpLyopWPqZWBZVI6G3p8LPDNc6qI6DBH6PYKrVCeaoZag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722065; 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=W+wyhc1jFX+IxQMA0GHKJumNA9z2fdmohjQ7ku3aEkU=; b=W4uWhsM4tx2aJOW9D1TDitOviaEGunKZ8mUYLub73mNvTrvy5Fzb5JA5I0kftU0TC0K4OX NoHn0Rpj1nZFibRvsRQQg2J/EtsxyZ0POf2t/OrcJOHYCeyw6ybIkdKPiC3px00Kwapotz H4po4Rx8H5lF7SYoSGEdSsljEBrITuNe1cumlLIaL5nXs1GBko4vfSPETuU6o+nuqraHzZ gpUvcIvoYBol69Sta4qbXYb5AG0K/Vm52ZOMqm6QD2IwTrdVXxXQE4ZBDe3pm4lvFcZgR2 w+LWBwny8vwiHXLgaM/3d4EmIPZGSyisQ//cYc0xBH15HzCik43TSbwG5HH96A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675722065; a=rsa-sha256; cv=none; b=MTpfUgW2qOH+wzsObz9QuTeugI+s4SwzxBWgaZfrI/1aiad80fV9vqLLnDnhqdiEZNGfQ3 AJn30R9xZUkcrGPFYyNZlHCwj+Cf66iTdO2uTSii5RheReSJ1NYo+CSo+3010Yqz0h8fyP XiMqkcRNu1w8EAM2eLFG6WfPbBkpdWQ1zKGdaHkTjSGAxQcR8fFARaar2JFBCLdtHbmbuF EviqnYKh78DJ5Ju5CzS6McNr8laYIsEkcYSgDSrGpTBrJuJH5J0L56Ea7LBuMuskQZ8loS 8xtvsRdwqCheD2h9BdRtsybgf6v2UTHMUuZK9/1S2EIg7ViWJvgucnVNvew4YA== 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 4P9ghJ6c4JzsL7; Mon, 6 Feb 2023 22:21:04 +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 316ML41O060076; Mon, 6 Feb 2023 22:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316ML4lZ060075; Mon, 6 Feb 2023 22:21:04 GMT (envelope-from git) Date: Mon, 6 Feb 2023 22:21:04 GMT Message-Id: <202302062221.316ML4lZ060075@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: 4da78e7a355e - stable/13 - sctp: improve delivery of stream reset notifications 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: 4da78e7a355e702d5cc353f06669b6ef6f43b559 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4da78e7a355e702d5cc353f06669b6ef6f43b559 commit 4da78e7a355e702d5cc353f06669b6ef6f43b559 Author: Michael Tuexen AuthorDate: 2023-02-02 13:46:10 +0000 Commit: Michael Tuexen CommitDate: 2023-02-06 22:20:32 +0000 sctp: improve delivery of stream reset notifications Two functions are not called via sctp_ulp_notify() and therefore need additional checks when being called. Reported by: syzbot+eb888d3a5a6c54413de5@syzkaller.appspotmail.com (cherry picked from commit 7b2f1a7fe9445ea318f34bd3db971076b61ef831) --- sys/netinet/sctputil.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 1b2ba9371021..a56120b99f47 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3815,10 +3815,17 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t struct sctp_stream_change_event *stradd; if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) { + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || + (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { + /* If the socket is gone we are out of here. */ + return; + } + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT)) { /* event not enabled */ return; } + if ((stcb->asoc.peer_req_out) && flag) { /* Peer made the request, don't tell the local user */ stcb->asoc.peer_req_out = 0; @@ -3871,10 +3878,17 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 struct sctp_assoc_reset_event *strasoc; if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) { + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || + (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || + (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { + /* If the socket is gone we are out of here. */ + return; + } + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT)) { /* event not enabled */ return; } + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */