From nobody Sun Sep 11 12:38:23 2022 X-Original-To: dev-commits-src-branches@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 4MQTmH5VCpz4bkbr; Sun, 11 Sep 2022 12:38: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 4MQTmH4QP2z3kll; Sun, 11 Sep 2022 12:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899903; 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=yKibv/RQXOYDW52He/GkW9owGMX+zwXVbGc8vKpxXFw=; b=BVX1DWLn3qAh0PzJ9OzQmQDaX8QsZFWal3ORu1b8vmeR+cJtZobSAtfo+/dNANv7eYr7Rq SNUPNdYHxpXESRUcE9mTQKpxd7QyoLHLstMLJnum2kk5RW+v+fES0a7WKHyHzL26PoREXI +F7b39z8M8MSeytZ5/sRFOwE9htOMZflHZPtAJHxHmoCkrSbh92y8tFaZ+d5HEkAsBdo84 9WioNNBzHDqqKUo0hDXUrC2IszaRi0LEdQsmWHOHR1Uhqe4NP0MwhxwaI/aelk/l++XORk qIiUgtwsIKg3XSL5hocjso7CAhS2D0+I/bmGaWdwHUSdQb3jz5OvVnytxdqiXQ== 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 4MQTmH3RhHzf6v; Sun, 11 Sep 2022 12:38:23 +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 28BCcNuA090645; Sun, 11 Sep 2022 12:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BCcNvf090644; Sun, 11 Sep 2022 12:38:23 GMT (envelope-from git) Date: Sun, 11 Sep 2022 12:38:23 GMT Message-Id: <202209111238.28BCcNvf090644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 55543349168a - stable/12 - ipfilter: Remove unused ioctl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 55543349168a193e0f2ab4375e90845af9a64d59 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899903; 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=yKibv/RQXOYDW52He/GkW9owGMX+zwXVbGc8vKpxXFw=; b=AsjiQvclsj2nc20byuIVPxdd19JqmjJHe9ShYC8n2YWjM6EyZr5Zhxz/4Jia9OuwoTV5Vc Horo0pR0S70g6o90e6hEbRtjJT94d8ktMqwNd8HOKhVVXx5O4/UTN73jY+wV4QJ47lKwTR Fm9Oxd7ha3dL8ZKNNE6obLzcscBwF+5wfk1q706pztjs+H1d4bgrKvN6CPbMEGpuB3vwK5 NTS9bVcNwJWsu9Kf5smjaxjb14JXd5PrqWDLteODKaTkjIIA+H3wg9/Rz19hYTPljGLUls 1ysFKL7bkor/RR1GEhir+0KrlG5OwV5b56u4SAiaMxSB+XoVms01MbMCXtFhmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662899903; a=rsa-sha256; cv=none; b=gTPwRk122NIZNpEN/8/KIym86G3rOqESrconXh68R68hrNCKE7DcIt94NtvTB8uZfSOHcB n/oJQUIRUSYVmxBuCeRpNd6iYfkl5BQOsTZm7oagTA4BQxzpSwaZRVxa3fA04xS6W2leL8 ziE1A4WnY5JDY/5DYd2lzdP1ROlb7nHBMRfAWkyOuBHZ88jX6Pt8UU+cljdxeyDaw08SCn Hjs8iUFu6loSwoLphpmWtCnzaC1LC/04y903U6Bg7tqCU6C0J6X0TiDuxmWyBOSZ7m162c UKRlSLKcAvBmuVw2W2Sk57D886TYM+m6HU8gLU3CuUPBGjc9XQB+YW7tDGxgZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=55543349168a193e0f2ab4375e90845af9a64d59 commit 55543349168a193e0f2ab4375e90845af9a64d59 Author: Cy Schubert AuthorDate: 2022-09-06 20:58:35 +0000 Commit: Cy Schubert CommitDate: 2022-09-11 12:37:50 +0000 ipfilter: Remove unused ioctl The SIOCSTAT1 ioctl is only used in ip_auth and is unused in ip_state. The ip_state version was likely added to support a new statistic yet to be developed in ipfstat(8) or for some sample userspace application (similar in fashion to the sample provided for authentication rules). There is no need to report individual state hash table bucket lengths to any future userspace application. If needed for any future debugging purposes a DTrace probe would be a better vehicle. This unused ioctl in ip_stat results in a panic. PR: 266124 Reported by: Robert Morris (cherry picked from commit 1f7a710ab35845049f17958c3783041c214d8a3c) --- sys/netpfil/ipfilter/netinet/ip_state.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index cc0e8559fb16..463416f454a9 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -751,18 +751,6 @@ ipf_state_ioctl(ipf_main_softc_t *softc, caddr_t data, ioctlcmd_t cmd, error = ipf_state_getent(softc, softs, data); break; - /* - * Return a copy of the hash table bucket lengths - */ - case SIOCSTAT1 : - error = BCOPYOUT(softs->ipf_state_stats.iss_bucketlen, data, - softs->ipf_state_size * sizeof(u_int)); - if (error != 0) { - IPFERROR(100017); - error = EFAULT; - } - break; - case SIOCGENITER : { ipftoken_t *token;