From nobody Mon Apr 29 14:36:47 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 4VSm9r1yTvz5JS6d; Mon, 29 Apr 2024 14:36:48 +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 4VSm9r1VSvz4KZh; Mon, 29 Apr 2024 14:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714401408; 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=fb1SGxmTrpQZtKuFqrdfmB/84BtQVrqGHbbH8PZ5Xdw=; b=rEka1D2SFZ+SXSAf9nYdguSI/Y8YyiJuiqT1DLC+17DQ3OkEiOJY6fAll/TpWjgWwT5iyz 9mWJYcUKaCwyGlXz1zMyDS67q8Cm4u7i4o4zNk40EdhQ02OuvBgxoL9QpsqNoYRLD7x+HL VlioepRi6gqBoNmcmRW9kKGBLKaMX8gXK6YL4VxIp9JLJg33G9opBMW7s7yHLtwMCv5NoL NEFLTFkAt/3A2pjXUffQG1C4+6G9mYoBJPjmRdKyd8OrSFfQ5sAk0M6x818dHtLi6ZPzCA 92FpInnJEy/zV8/KaMdMmioa8yu4Hys2SPD21QznCr7BbmazZN5/UpbhEhoyJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714401408; a=rsa-sha256; cv=none; b=nMXWXC6tinjwHNxhR1To9I12+r/HsZM1/VlxuaLE41hpPY8gOaDo8mjCQfckGfxWBulUof SGj6FrZvimMkiOa98RD0MT9AiAovvkWxlqCRH5/lg84xQ1EQMpZ90BdI9d+E8WZqkYR0hq aOfzSvWZ+1eN+lQ7Y2StxwA4ugbYRcKMAVR1bBMxQuyTGUyeeZGZLAdkgY5UqZymXF8i2Y aTtQ8u9r8tBEmsekG/JH+4sqy6LYjfVpEFwHVPDu9dQ4yNzx9NsFVsSg7TJzr4n/yR0xIy yOkPZbm5NHGOs3Z1LOtHc4RpwXvBfGJgW7CGphRHa2VBq7PxO/nqEE6Q4CdHrA== 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=1714401408; 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=fb1SGxmTrpQZtKuFqrdfmB/84BtQVrqGHbbH8PZ5Xdw=; b=rEDNHonSOZhRX5uj/b6rZhhbDcwIV/gj/wYm91gstwuPXKgCVbv6iA5JGG8hoVk+Uwy4Ig RBcrtdJWBrUAjifm1h+wQFOUHUshb3MttNnlkf7sPYQrKk0lF0k5ikekcNiO1jLYCDVAef eAQ8QlWh7dJ/0EDNtbAJ6w2c3BoxuKlJgSZrUOOMaQAI3+QW/7RX6p1Xz5iGLkSsMIbeTE VVycWX8xYDRznYlVGAGCLace4bFrhO6HHtSKTpAsBuyZhgeULYESV+9uIc/qZjiUz3FSGo Ufv3LkfdewJNYXN567F5yPYiRg3DeVySmOCRWthdh+tbNJBUrVIYJErt+sxcYQ== 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 4VSm9r0wtcz1C3y; Mon, 29 Apr 2024 14:36:48 +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 43TEal6o080560; Mon, 29 Apr 2024 14:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TEal4S080557; Mon, 29 Apr 2024 14:36:47 GMT (envelope-from git) Date: Mon, 29 Apr 2024 14:36:47 GMT Message-Id: <202404291436.43TEal4S080557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a3f7176523e8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a3f7176523e8611b259cefd7431c01e24f446db7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a3f7176523e8611b259cefd7431c01e24f446db7 commit a3f7176523e8611b259cefd7431c01e24f446db7 Author: Kristof Provost AuthorDate: 2024-04-26 14:07:38 +0000 Commit: Kristof Provost CommitDate: 2024-04-29 14:32:23 +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 --- 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 076cfd3400e6..b42afc542273 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -325,7 +325,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 4e06981a79c7..bdb4bfae4be1 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]; };