From nobody Wed Feb 01 22:42:17 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 4P6cP56w6Yz3cDvW; Wed, 1 Feb 2023 22:42:17 +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 4P6cP56TGhz4LtC; Wed, 1 Feb 2023 22:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291337; 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=VGBu9B7xrfQ1KtSFY468/pulAPdF/RyYPoo3dRVFUuo=; b=kk96ygeLz2SRIUB1SkOq4PlIRz9f+gDzgCy8FlSciAnScMGZ6WeeXKrPf2jt4g/PQeWNRr YtzSn+PGSZkY2DypxcPIe0DLoLY+qzl99w8m9Q/PkIozX819w50nO1MCiIsq8Rsundh+LF wAOA8W1qcfJYorhQNR3MZ+WY/rYkwyFM9xAy+hcbInP2xr3vt0b0uWyrvZ8n78ATltWQ8N dIDISUdGgkSZilf7yAjenSehZ7zzPuEa3TUSqLTTRW3yfLKY7xcNHbM28IHlJDXqJXxORy z5OxtfqU3mGt+UCpWYopao9u5ZFODB5uFE7FQiULbFWEEcFqCzRcs9vNRXvTdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675291337; 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=VGBu9B7xrfQ1KtSFY468/pulAPdF/RyYPoo3dRVFUuo=; b=xbW0MHkYWR6/7zYv+p+gm9ex5CYDD5UMI2LBNlari4c9qJ30IvCMg6SQXVPl43alG5OPaF EAxi3pqA3VeyJBmF70aN0wS1pchYoRsjz16lj6gY4r7t/XKM8a5ufKL2kg8ID8f0bPvqnE EwbHFTEir/as8ojFI17WIabWMFbIYkd2bFwGyAA4iZklQm92FJCHRcCTjvqIiB9huumvkv aMifDW4427+7x/b4c/KuFwmJ8016phFzH4k6jVWczrPvCtc6ksgmYjuwFDrkxi22uUIKrM ZTbZcn1yaAPXcILLRMsUDVbFLdL4Kzvnx+iP8oPXUDNDUJY9mki+yJ9a21tuwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675291337; a=rsa-sha256; cv=none; b=ScgMueDVxl+mzvRTo62zx1LKLu55AJg7Pte/aOC0rGZjE0HLef+gN9d0vdbu6t8iFI9lPq Dmc7GF4MC4EALH3fjcdVMXjKeIOvnSYTPeYbihTXjhjcJZjQqO2ddBfMEcVBcU8MfVi4AI BvrjfEE8aDFvG893wE1qX7ZBHlSic5Pbq0m1pdCULrfQ66W+MNdVCxHfnSDydvTFNSSZ+g JpZJNYzXx58EhZIoUBnxDxqooGZ+i1m9J4f/gM4WnZrIsWMUxuozndmE7d4n0lO8zRtVlq I71XuBFN69uv2kfIW1PG9fBJGgQ3AKQyOM+yGVzj4Tjl/Hu3kf6mVrIu8pb8nw== 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 4P6cP55XK6zWxh; Wed, 1 Feb 2023 22:42:17 +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 311MgHmB000703; Wed, 1 Feb 2023 22:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311MgHJF000701; Wed, 1 Feb 2023 22:42:17 GMT (envelope-from git) Date: Wed, 1 Feb 2023 22:42:17 GMT Message-Id: <202302012242.311MgHJF000701@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: d3336114f7ca - stable/13 - sctp: don't wakeup 1-to-1 listening sockets for data or 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: d3336114f7caafee1381134de0b82e5ca74f47cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d3336114f7caafee1381134de0b82e5ca74f47cc commit d3336114f7caafee1381134de0b82e5ca74f47cc Author: Michael Tuexen AuthorDate: 2022-04-16 17:42:27 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 22:41:54 +0000 sctp: don't wakeup 1-to-1 listening sockets for data or notifications Reported by: syzbot+ec9279d306a4ff0215f8@syzkaller.appspotmail.com Reported by: syzbot+31d54f6d486333493dd4@syzkaller.appspotmail.com (cherry picked from commit 3dc57df91e65acf9abfbb437110845f380a8b312) --- sys/netinet/sctp_usrreq.c | 10 ++++------ sys/netinet/sctputil.c | 5 ++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 1f046fb3189d..5dad0460fea9 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -5074,9 +5074,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } else { sctp_feature_off(inp, SCTP_PCB_FLAGS_STREAM_RESETEVNT); } - SCTP_INP_WUNLOCK(inp); - SCTP_INP_RLOCK(inp); LIST_FOREACH(stcb, &inp->sctp_asoc_list, sctp_tcblist) { SCTP_TCB_LOCK(stcb); if (events->sctp_association_event) { @@ -5136,10 +5134,10 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, * style sockets. */ if (events->sctp_sender_dry_event) { - if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) { + if (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) != 0) && + !SCTP_IS_LISTENING(inp)) { stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb) { + if (stcb != NULL) { SCTP_TCB_LOCK(stcb); if (TAILQ_EMPTY(&stcb->asoc.send_queue) && TAILQ_EMPTY(&stcb->asoc.sent_queue) && @@ -5150,7 +5148,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, } } } - SCTP_INP_RUNLOCK(inp); + SCTP_INP_WUNLOCK(inp); break; } case SCTP_ADAPTATION_LAYER: diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index e0ac9e23fc68..d0376f03e8db 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4836,7 +4836,10 @@ sctp_wakeup_the_read_socket(struct sctp_inpcb *inp, SCTP_UNUSED ) { - if ((inp != NULL) && (inp->sctp_socket != NULL)) { + if ((inp != NULL) && + (inp->sctp_socket != NULL) && + (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) || + !SCTP_IS_LISTENING(inp))) { sctp_sorwakeup(inp, inp->sctp_socket); } }