From nobody Thu Jan 11 13:00:02 2024 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 4T9lBW0ll3z55gTg; Thu, 11 Jan 2024 13:00:03 +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 4T9lBW0Gbgz4F6k; Thu, 11 Jan 2024 13:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704978003; 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=a9f+922MIm1b53DjO7WRtoTmxsQA2Q/8LQYbMIwFazs=; b=KmGQTEoTOzCeai89WZpjd3OG4YwMkiNDwvddhOcE+P6KEg/acO73XefrQpOtrSG0ZkEgll 1f7gHxni+lqcCnx0zeOexsDnuUL4hQ6qN/G1D7vm91R1bR5bgD5RlbbK06zfMxhinOvAjz 4dpKPCb+N+d/EOMoogMvwiYq++mIcx0bkKWwFEU4G9M+O9rJ+Ixs3nPnSbPA8bl/uajMGy +8QBsKaUY0Nb/yA0oIf3HAWwqAFoJf/VedNaILv47OGoFxpo5v30xIYNABzHFWwy0fPoqH sToNwyq5PrwnBWLoZ2xyC1JHC76HUlvmYknlhWkUPD5UvHKPj5owpQmZaC+RDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704978003; 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=a9f+922MIm1b53DjO7WRtoTmxsQA2Q/8LQYbMIwFazs=; b=gTxX0lZ2H7UWcF0WM2iYI/+t++e4Q6qmclqvfpYhJSr7Vxz4C19bPI7hMV/ztA5NUSLDec jFKGs1eIOwtIYicnC5ZjFsd2X9cZZI9vteTHIm8lpXf/pc3qDB6JP8u7QVy6k+s4ra3MLh Ln0hIzRtiuEsBCuyZfYp3os+xGZAYzahDeXF5K0ksALr8cp2sBteGMaCehs1szFGGS6zQH lbp8gj5rF4kWXbOj94uh9KrkYrm08Cc2l0yndA9rQyEgEj8OGp3Mxo5bAQwycwiKTzqyC6 ZE7MRgnk16J7jqu71P4ZQeqzlg5dtC6tcioFEr+eqAp/Mi0hi4doeTNXPTzP8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704978003; a=rsa-sha256; cv=none; b=pUcK3JmaNxM/v3hTXXOL+//glqsU7zp0uOuA/48Op4+kkPUpbR0+51FcHTxjyNE1+vWnwx LaJbTzOCQJabEcWWZecg52rJsoUEpbyPVZ6lQip5mBf1qTaI0yejoSxzF+6Uo6I6oGk69u +U+2r3l0Dtgx+/+NDT9UM2NCVt+O+rnarXWRYwBwBL0pOWMYwJ7ZNJGUoFKG4Na1hHpIfk zyaG+6V9xX1IcijiqFZBzWF1Q7HTKPqh1nclgGTTbtsidGOziDKdbpOi10q4q5IepNppIf 4upBpAiN8uXwWAikDATgzNZ7jbdv7LW8C0eXkh32PaDI2k3XIXwgyHO449m26Q== 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 4T9lBV6RFczJrP; Thu, 11 Jan 2024 13:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BD02fB058203; Thu, 11 Jan 2024 13:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BD02v0058195; Thu, 11 Jan 2024 13:00:02 GMT (envelope-from git) Date: Thu, 11 Jan 2024 13:00:02 GMT Message-Id: <202401111300.40BD02v0058195@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: 947d455fe545 - stable/13 - sctp: further improve shutting down the read side of a socket 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: 947d455fe545687a4cadb4d87c6a2139ca73b6c9 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=947d455fe545687a4cadb4d87c6a2139ca73b6c9 commit 947d455fe545687a4cadb4d87c6a2139ca73b6c9 Author: Michael Tuexen AuthorDate: 2023-09-13 11:02:51 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:59:04 +0000 sctp: further improve shutting down the read side of a socket Deal with the case that the association is already gone. Reported by: syzbot+e256d42e9b390564530a@syzkaller.appspotmail.com (cherry picked from commit bb56b36d7188e004840294d0bd5dfdf7f3392a05) --- sys/netinet/sctp_usrreq.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 9f1a33b5ff2a..3289d86ba831 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -818,11 +818,9 @@ sctp_flush(struct socket *so, int how) return (0); } stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb == NULL) { - SCTP_INP_WUNLOCK(inp); - return (ENOTCONN); + if (stcb != NULL) { + SCTP_TCB_LOCK(stcb); } - SCTP_TCB_LOCK(stcb); SCTP_INP_READ_LOCK(inp); inp->sctp_flags |= SCTP_PCB_FLAGS_SOCKET_CANT_READ; SOCK_LOCK(so); @@ -848,7 +846,7 @@ sctp_flush(struct socket *so, int how) } SOCK_UNLOCK(so); SCTP_INP_READ_UNLOCK(inp); - if (need_to_abort) { + if (need_to_abort && (stcb != NULL)) { inp->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_6; SCTP_INP_WUNLOCK(inp); op_err = sctp_generate_cause(SCTP_CAUSE_OUT_OF_RESC, ""); @@ -857,7 +855,9 @@ sctp_flush(struct socket *so, int how) NET_EPOCH_EXIT(et); return (ECONNABORTED); } - SCTP_TCB_UNLOCK(stcb); + if (stcb != NULL) { + SCTP_TCB_UNLOCK(stcb); + } SCTP_INP_WUNLOCK(inp); return (0); }