From nobody Fri Aug 4 21:04:56 2023 X-Original-To: dev-commits-src-main@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 4RHdWr31lCz4h5PY; Fri, 4 Aug 2023 21:04:56 +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 4RHdWr2MnNz4YCs; Fri, 4 Aug 2023 21:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691183096; 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=TMg22io4Cr6LreVJA8E/p/p3XtDjKUR/OXPnC+xZ/x4=; b=kyFpfrLYte8RaZ9SGEwBmFAz5vo8FoEfWpeUWyZ5OYKNQCvVmLP+4HrN96McpCdWHi6Per +QOn5Ejl2L2ONZT5U7/GoU3G04itrqdI++yxizShvLFCAL5DKZfTO1eFuihG5LDb6FbYjE r1u1EJF88pTWO0xrdk+jABpSeLGbBHMUeyNSsmsbWc3OC2qHqzopds0ClVNj3PqEXj4aXq LOZYFt8DEPxdJC8ZSh/fHgefV3pINh6whSu8TgnwUHxklX48UALU6caI5Qopwu5t1Tpvud L3khdGlb2gMhkObs0dcNHKxVNBX4jUIlYJMW7Ia63/TJHNYNnqgdRSlFnBFNGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691183096; 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=TMg22io4Cr6LreVJA8E/p/p3XtDjKUR/OXPnC+xZ/x4=; b=WEZx13HF5ta4lKkQzQ/G+L8BCeAU4/cDW13ddxiPh+ywI+oYK5gKG+vOwQtL/MeowrDJYB dccSZjnyNj9IJOElWLIASOn3F/xE8QKogMk7H5clK/ukUSKk7ZcdgeIk7jdB+XpWrSZMYV Bw5CJx/2hjMk9aMKsqH3Cp7aLsoCvdeNI6c/iTkxdS+PFhy3cxcLO1sMd0pID2PqLOEsk9 jZiUm1bTLKhkafFR29Bw42NgsCAjLw/ZTaB3yjxuh2upHkb+VmJ/GRw1LWTwBvSkiBW7XB vLA8mURKPNxjCUodj/SgahJokSZ7xUbIlPsIrJevA83NhbE2HExRtacuH98d4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691183096; a=rsa-sha256; cv=none; b=CW9PBlHLsK0tQV4U1mpN6nzdbefy4u0xggkZWqUUT06mOqWz1vna4Jhf06pzg2cfwtXZdA U2Y58GJwz4cp6Fx7dj/TI91yUGwCtN7TbwtWu56MJyhhtXImqj79ApvWj+0oAiGEc6EoRn RwMPx9kRbdkdGY0RxRGeERC+FG/qBYr1hwrU0fK2uyA8HPfvWJqrDx5avGozg8qPtxjnwN 1UgojHmibTSfNz41RyDNoQs9gKU4vTXU18zkw25v4bDfMlHX3Q0ZOZFsPuP0ulWhR7/V1r r2CHOdJLBwkMcmzOu0t2shiULkMAj7zUVoGWHSfGv7xSRa2fTGUSt07MMOZuBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHdWr1NYhz1HKR; Fri, 4 Aug 2023 21:04:56 +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 374L4uR1093733; Fri, 4 Aug 2023 21:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374L4uNX093732; Fri, 4 Aug 2023 21:04:56 GMT (envelope-from git) Date: Fri, 4 Aug 2023 21:04:56 GMT Message-Id: <202308042104.374L4uNX093732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: efb04fb404b2 - main - sctp: improve consistency of acc and ccc handling in snd buffer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: efb04fb404b240a99c618e49174cd6260217edaa Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=efb04fb404b240a99c618e49174cd6260217edaa commit efb04fb404b240a99c618e49174cd6260217edaa Author: Michael Tuexen AuthorDate: 2023-08-04 06:32:25 +0000 Commit: Michael Tuexen CommitDate: 2023-08-04 06:32:25 +0000 sctp: improve consistency of acc and ccc handling in snd buffer Don't clear the counters for the socket snd buffer when shutdown(..., SHUT_WR) or shutdown(..., SHUT_RDWR) is called. This was causing the system to panic() when SCTP pf tests were running. Reported by: dchagin, kp MFC after: 1 week --- sys/netinet/sctp_usrreq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index d603ef5efcd6..aa957ffa9f96 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -838,7 +838,6 @@ sctp_flush(struct socket *so, int how) SOCK_LOCK(so); KASSERT(!SOLISTENING(so), ("sctp_flush: called on listening socket %p", so)); - SCTP_SB_CLEAR(so->so_snd); SOCK_UNLOCK(so); } return (0);