From nobody Thu Jan 11 12:22: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 4T9kM307yGz57KHb; Thu, 11 Jan 2024 12:22: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 4T9kM26cRhz41Sy; Thu, 11 Jan 2024 12:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704975742; 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=j83d29f/B+Gwyrg39/5EX0TdSTg1vUrD1htNfCbe8rw=; b=sc/5GtBy/Mzeyvssynm3dLwDZc7+PIkUyurGaFrKxe9Ay8ejmeQls90kQDKF508n5jcYju qAAHf2zoYSmMdXGUd7Dg6HELmGkQVhNgr/3DhfRy/cC4rxDDJOK9TO57dsKtMuC0SVv63b HQwJf5PHlA9/LINZEy3J2Uo1KyNUflt1Vda4RZeuC5qVow3X0P4TIsT5V4F1Hj3tLHAwZF xfIAXZF1QY+MaHrQFWwvibaa25OITTa0P7iSreJW1Y4KmIQiR6fyJ7dKGq/ynfqjTai94F aDpajewnyAlXgUEaFaqvBbit/GnYiRUsPjUt/Dkbxzoeem4rsMna4sq9lPU8kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704975742; 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=j83d29f/B+Gwyrg39/5EX0TdSTg1vUrD1htNfCbe8rw=; b=hDMwHtL8HyQv+Nbbur+IRYachX+XE69QbTJ9uC+w/ufxcXp3FYpg0TiLgjqAg9aWVicU5w pA7fAuYHN3jWwGKeMA5UodyU4YT+y4AOki6/t+VwicfdYl0wcyxM5/4z28qHKcmQpioTdF DyAJKcT1dTsTBbbfFcm7yp1/MAoxXfwfS6Ig4lDH/0ox6nKagMkUHM/djSFu/PZVU/1B13 27gNy5u4cqYxHFTcutvGlwNw5STylzeSDWJ92X3LW7DqRSZnz56m93luqJnFO+x2yEHfmU nvHcRqye3AY6OEo3gc/1icmPdHNmaF9QE5Q3sZB19fzoBVXkluNPMYokZAbeFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704975742; a=rsa-sha256; cv=none; b=Gn+wjfjTMJZum+kWcf2yyZfzAIwyZA2cVBEWUqoXE7nxgtMdHW+9JVuwaLDRxMOetNBM+m EiV1YIuxbjnNGwOiV/IwWNVxsXVRDwBCTSOxKQ8YdHRgvELuV4G9x1BMHEWGvroy2eg3t1 +/GtL1IulFjVNMa7UoioLEHHGFZButdppzQUl5WUGNFjTPp5pFHKrZeAO0KsVEmFhIy1zY dQI9QIjQE5kuExIA25mUHey2Tw9bRhXlol7qRVYuMJptF1+OyFJwbsTlFkUAG0zzyj9ZKI 2GYTncCpIy8vfkec91ww3atyjoy2b9PKVZi7LJljGjdMqQF36Jy4B9r8xfKgkQ== 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 4T9kM25hJZzJcP; Thu, 11 Jan 2024 12:22: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 40BCMMVH099866; Thu, 11 Jan 2024 12:22:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCMMll099863; Thu, 11 Jan 2024 12:22:22 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:22:22 GMT Message-Id: <202401111222.40BCMMll099863@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: e47f243218bf - stable/13 - sctp: improve consistency of acc and ccc handling in snd buffer 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: e47f243218bf62ae2f3ad915d7b8d73893b4b4d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e47f243218bf62ae2f3ad915d7b8d73893b4b4d6 commit e47f243218bf62ae2f3ad915d7b8d73893b4b4d6 Author: Michael Tuexen AuthorDate: 2023-08-04 06:32:25 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:21:45 +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 (cherry picked from commit efb04fb404b240a99c618e49174cd6260217edaa) --- 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 bcfc496a132a..10af0c669f04 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -848,7 +848,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);