From nobody Thu Jan 11 12:49:22 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 4T9kyC2PnTz55fNP; Thu, 11 Jan 2024 12:49:23 +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 4T9kyC0R6jz49Ms; Thu, 11 Jan 2024 12:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977363; 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=1AJXN17PJo2uRh49Bq2bmDxdwafoysfPrZd8fsUvQh4=; b=ZPs9jcnXpJyTr59Ri2eONzUwOly6kqYkzVzb4nF4bs1PNOuY08UJBBtEQ663lcMkTrBwL3 j7jYGVT3X0Y9l6LSNC3O/Wcwd2hvy4xjV9pbnQMvzxDLDSQTEykoWWxPBFp2qQwzerJLhM p6Xb3bSJEQRrWtzaQWY0PSDfvsZSWgcw8MwMZNAJVAOvZ3Fk+BgAcB7Qz6l5CSBfNwwCy1 JMLbKfdPMopfaGCpu//Cq1h/mFKJ/E2y9MV47GTvrDDJeYy9OFYPaoAbzkH6aiEqylGSii 1Lc6nl92oh+S9nBGLfrZCViv3derYRJcHBGiu168MwRykDf1EXIbN2Ru6O5U0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977363; 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=1AJXN17PJo2uRh49Bq2bmDxdwafoysfPrZd8fsUvQh4=; b=XUroXzKZwFspwP2wDadG+wvum+V4SrdryfU7l2m3ieAYATEkNgajw8hiYKmjpHIfwkSBG6 eVzEt/b9qDSYxZFARxyc+/IrNjZhGwo3E1+69fA8sZHgt9nc4FJ17DI15bJfvQrgaeApBE h5F9ztxc7WYlYHWgkLqTe/75p4sUHxPBfnA7uZsawtVLkpx7HSaYvyjlbmAUZx5aKRkwsF lyz2fjj8aZf/VT9MMpQLqCdWA5RNI5ZtBtmGMw/2Xb65DYdP8qKxbwaX1/W49hnihuETjF pSs9xyWJQzvXnp7rELEMhJEYP9JOy5DV7jSJiakgMXe1yutG7R8Pdh7/W/JlMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704977363; a=rsa-sha256; cv=none; b=KDa1LwjLxY6MrfonGNm7TMyFRgHdGpmZzdBw4/rOb17TqHr16LJJ96bFiaGz6GRNYqc2c9 6mk/hNl+yYE+w3l+z+ikBP7qcNaTTCrdoRQ1dVh5AY10HTprbZ7bKQ3h2G7QIe1QGem4EM +fXMImEkMaxStGBNSUm46azMQRvYuWfAjVelPaS5rFPbDRXM8c8W2sgM9vY4rojcyLr0pB jaDmceCWbvMpNx1pYiHLs0iqEvUIc6eN6H6VUU53JJioEwi1YWXQ5Lx7cL3qryIUT17aPJ hD1N1cAj3mu/Z1SH+HOxnPcS6VvKEGVDRieR4ZwcZpBDD8eHSSdV70HNVU18BQ== 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 4T9kyB6clrzJqs; Thu, 11 Jan 2024 12:49:22 +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 40BCnMRK036674; Thu, 11 Jan 2024 12:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCnMkn036671; Thu, 11 Jan 2024 12:49:22 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:49:22 GMT Message-Id: <202401111249.40BCnMkn036671@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: 608c8658c8c9 - stable/13 - sctp: improve handling of socket shutdown for reading 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: 608c8658c8c9e78ccce884e137ac341366653e01 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=608c8658c8c9e78ccce884e137ac341366653e01 commit 608c8658c8c9e78ccce884e137ac341366653e01 Author: Michael Tuexen AuthorDate: 2023-08-24 13:52:55 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:48:31 +0000 sctp: improve handling of socket shutdown for reading If a socket is marked as cannot read anymore, drop chunks which should be added to a control element in the receive queue. This is consistent with dropping control elements instead of adding them in the same situation. Reported by: syzbot+291f6581cecb77097b16@syzkaller.appspotmail.com (cherry picked from commit 847fa61fad5ef118dc0591d876bf9449200aa818) --- sys/netinet/sctp_indata.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index f7f0e3fdfe7f..c195cce96f39 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -1290,14 +1290,17 @@ sctp_add_chk_to_control(struct sctp_queued_to_read *control, * control and free up the chunk resources. */ uint32_t added = 0; - int i_locked = 0; + bool i_locked = false; - if (control->on_read_q && (hold_rlock == 0)) { - /* - * Its being pd-api'd so we must do some locks. - */ - SCTP_INP_READ_LOCK(stcb->sctp_ep); - i_locked = 1; + if (control->on_read_q) { + if (hold_rlock == 0) { + /* Its being pd-api'd so we must do some locks. */ + SCTP_INP_READ_LOCK(stcb->sctp_ep); + i_locked = true; + } + if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ) { + goto out; + } } if (control->data == NULL) { control->data = chk->data; @@ -1346,6 +1349,7 @@ sctp_add_chk_to_control(struct sctp_queued_to_read *control, control->end_added = 1; control->last_frag_seen = 1; } +out: if (i_locked) { SCTP_INP_READ_UNLOCK(stcb->sctp_ep); }