From nobody Mon May 13 15:43:32 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 4VdP0N5tBZz5KVCJ; Mon, 13 May 2024 15:43:32 +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 4VdP0N31fkz47Cy; Mon, 13 May 2024 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; 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=ZbvRz9GWmYd6+jmkj9R8C0JQosnCbOOsuM5UdOBlJew=; b=NOrzyGgJfH3u+oVmGRTfBcMAUKztnAa++LP6B0c3OUFJZS8HrTN+v1fI6rh1bu/QZxtQgC b70zMOAsD3fMDKhRn/02kzwNUVXhhtYAs3ty4Mg9vMvWGf54d0CyjCVyrsLV3mx1aHD1Me qExLyf4LgoWaEZHC/vv8c6oJaIatXeIiq2DlQse+yeXBiUu91SHLki+mbEMDHidEilqgba xeF35ym+rf8mmi1796NGQ/6qi3E2KGjUFZ1YieDR04o0iwsK7MswLC7V1Pzn7NW25X2kMM gqChNMqw1rep/7eajKUku2IZyKB8wRWg7s6bceyRQQ6AkPK1/WG7CwwUx4Skng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715615012; a=rsa-sha256; cv=none; b=waFuU8+AILsDhDKnlh2q79zBBshm4ZYuhfWS2IcS1gyVIbrCR8NKzl6f/9+YrJeee9pXGa OsqXGifZHFOPBs/zS5AZXi+H3NQy5njcsOdGTajs6XDt1edg1GCZBEyIo58c+wXrEDV/ay 12lGOCmH7O2prEEapP2osVUYLV/4NTbDe1XEkX7yK621gSmupJVTd4xdm6/FgO0F5zG5PZ R975KEFR6ng0UgbX9CwDz+tHl7e4OPM+EV1gQDPmAz+sMmQl1CqEfOJsZng4sRelynrMVU P4L0eICGBvhLU1e0ozVzc/ZSxfHHnL4m2dklXl8y5DEiamZxQC7wYLoPiahfHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715615012; 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=ZbvRz9GWmYd6+jmkj9R8C0JQosnCbOOsuM5UdOBlJew=; b=cOfaQpx6zP7TolY7ygzJoxxZbkWimoNEL/qJCw5GJLJxsxS3Kpgnnww4ImM7n3k3+4sWTh tM/muX5KMZiWEMIOB1SV1RKlkNfXQrbtN7ggSJ0p7bhyVQdkf4TDNsX36fLxjLOVTH++eb ZdUOuV1eEdv6jj07znGQ5LhiEgXxjzlEHxTnhFEgXZD1fI54BIDwgAeIWMwJIB4zLPrire SKDLnQutIF3zV74VvCKtk5+sSE2xCxJ2fEVRbaDhPfhZMyIg9SYiE5Jawudu12ujO0NuqE u2b7pgM52oCJm69vDrvETI3Tu0Dg33RfjHa5bpwDmN1FL7k2GEbW4/+tjVRtOA== 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 4VdP0N2Q6czt2X; Mon, 13 May 2024 15:43:32 +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 44DFhW6m057225; Mon, 13 May 2024 15:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DFhWKc057222; Mon, 13 May 2024 15:43:32 GMT (envelope-from git) Date: Mon, 13 May 2024 15:43:32 GMT Message-Id: <202405131543.44DFhWKc057222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 14c2c7913c90 - stable/14 - libpfctl: fix incorrect pcounters array size 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14c2c7913c908e4c446cb809e1d7a620cedc16b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=14c2c7913c908e4c446cb809e1d7a620cedc16b6 commit 14c2c7913c908e4c446cb809e1d7a620cedc16b6 Author: Kristof Provost AuthorDate: 2024-04-26 14:07:38 +0000 Commit: Kristof Provost CommitDate: 2024-05-13 15:28:02 +0000 libpfctl: fix incorrect pcounters array size The array is 2 x 2 x 2, not 2 x 2 x 3. Sponsored by: Rubicon Communications, LLC ("Netgate") MFC after: 2 weeks (cherry picked from commit a3f7176523e8611b259cefd7431c01e24f446db7) --- lib/libpfctl/libpfctl.c | 2 +- lib/libpfctl/libpfctl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index f43fb78d9a0f..7dc375717acc 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -250,7 +250,7 @@ pfctl_get_status(int dev) _pfctl_get_status_counters(nvlist_get_nvlist(nvl, "scounters"), &status->scounters); - pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 3, + pf_nvuint_64_array(nvl, "pcounters", 2 * 2 * 2, (uint64_t *)status->pcounters, NULL); pf_nvuint_64_array(nvl, "bcounters", 2 * 2, (uint64_t *)status->bcounters, NULL); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index edaffdd12118..a2991cc05b04 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -62,7 +62,7 @@ struct pfctl_status { struct pfctl_status_counters lcounters; struct pfctl_status_counters fcounters; struct pfctl_status_counters scounters; - uint64_t pcounters[2][2][3]; + uint64_t pcounters[2][2][2]; uint64_t bcounters[2][2]; };