From nobody Sun Sep 11 12:37:00 2022 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 4MQTkj1G2rz4bkPt; Sun, 11 Sep 2022 12:37:01 +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 4MQTkj0kW2z3k5b; Sun, 11 Sep 2022 12:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899821; 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=DKmbwf7Astn84SU69Tc0xiMgQ1sCMrORk2E+tD4j3KI=; b=kFWxejPloaKSBIySYspYRO+1RjIx8o3nov1hN3CKCIzMdkVungBcvJqWz0U3cV4xYw7oqN rLozWCH+VI2Yi8/RUxhPZblVic/42ioMWgYNX/e6I2z39RJUQwIi0f8l5O7EqingYhMYdE X4y0E50rpBK+OuiadyNKBfYHefcUCFkJR/m338mmzLXT9Lk/7zq/vFpHR5V+TPiyZTYND2 AHy4toAu41Cs/RBv7QScuEKAReD5iWaeTJ5SqvpUX1XUBD62L4YfOzKG8dBv67s7CMmdLA YUDssX6FvF62pyujWwE0Aj107dLIxPVshZl1mO3QBs0fwaV0r1RjonDWMHUFkA== 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 4MQTkh6vyczfF1; Sun, 11 Sep 2022 12:37:00 +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 28BCb0nn090317; Sun, 11 Sep 2022 12:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28BCb0AW090316; Sun, 11 Sep 2022 12:37:00 GMT (envelope-from git) Date: Sun, 11 Sep 2022 12:37:00 GMT Message-Id: <202209111237.28BCb0AW090316@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: b9d5f7669a02 - stable/13 - ipfilter: Remove unused ioctl 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9d5f7669a02ace316823069b53f8578b2e45818 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662899821; 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=DKmbwf7Astn84SU69Tc0xiMgQ1sCMrORk2E+tD4j3KI=; b=vLtN8ut0t2eMi/oyCaUQfLvJ5uOf3ACOo+Al3wvW+vg+wCArVx9cdfWTKx2GLXHRrzDicl OeEg15aKyetr3c9R0cWaL51MSBWQXXqJDXr6ZlAt5GzS8LTCgT8XSFd+Jw6wb1wNaVHJuO FhqGlE8w13M0SJWbxtjyyJDMyktmyVtsMFvpiOzJtojpRzxGzdnzlb8HrWlsfw1UU2Wq/b xnU7i9MzhvpMir+MEHXnkqWCJvQVNmlFp8AjfZWMKPoLz6BGF8gr7UOKkcbzDVP9zEPz5D ShIMo0bVot42v5DosSfJDwa95dFfNvUbsH1uqoKmB2iSBCb4vSNKwTC7yPwAgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662899821; a=rsa-sha256; cv=none; b=qm29JjVjbR78B3D2X+mvqTEIC/La+HoqrWmIMAYiAcdNDWnb2SW8JkEyFVSrbFciqkE6L3 DkN1aeW/cAe7dOK65KqGQ4NFdw7j9CeiNXOUzVMiDZL5/wK0xV7/8qYtV05XMV+Mu6+Xn4 1ofI8UmmQ3rrudd0/KvCXt9a1/BXDMpMtRvP+5RqRbESdnAOK3YLiLi8AVvVkisCKLqSBQ v7koLyD7B7GCC4iM7SUCfkrk/80cFFz/nVt3NIKgIONfbsVgIvDUM87rvVg+VoP+hFtDCb NaioP5m8iUL8l9tZv0DCbFC3ieAM8aHgCJcT/G1qKNYtfERwzVM2cbgHC8X/rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d5f7669a02ace316823069b53f8578b2e45818 commit b9d5f7669a02ace316823069b53f8578b2e45818 Author: Cy Schubert AuthorDate: 2022-09-06 20:58:35 +0000 Commit: Cy Schubert CommitDate: 2022-09-11 12:36:30 +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;