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 4VdP0N2Tfdz5KV98; 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 4VdP0N1dDmz46r5; 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=PrMry7XcyxH+NRcceOX3ckDdPcEQF7ET9fbJO7+ow/A=; b=R3nrRJ+FEOTb5cAF1lg7b5WVAT4BvtLHWyVqy4skz9x0fBCy8ouBhMUiQf+LRDbY/WlYCP DTNg3ZmqyyLln29agbwe7Yb8KVNs9lN+ggbdCs76ArqOH3gc3bEGHG4P6CWLlViPsrhmGk f6Lo/NVy1P/Og8ToEng04OlQBiAiV4nTxWejHUEMjNDnE75fRIOjrdhdubCe25YdEP03Ae FxNY9icYxmzhfoE4VENUhfeZ7OtKWPlAw+xHgHpYrkL/FON4nMjc/Y+7rPojaKWytEQ6LZ rt6ExYpKXuJmgq0Wk2eDSPGZebSnqHihuQ9S4rmGspbWkQxtPDtT1Iiz7ooffA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715615012; a=rsa-sha256; cv=none; b=Vt4rccuXoSjAdkGZQaBXhhrUAZn5ZiBS+C8HHOtEbCwK7P32sC55rzJyQbinju2Fis8O2I h1t5x8fy6EjNWhsHIFxVPUVnYGvY7hXrpf7CFYZXEHRfNkG2wp6SX60GBOmVCqdUvsg2Xc ngGHZOe55yviaDPY2jcxSS1bWGW8Br2hyRPa6qtnJklkYswMd5nopsV9mIAQXSxEITdouq Rm+l8kmks+7Eb6YDlKAueUZrylHBC38+/6z7MXkf+sqTyNykQhsLCWGyOITTryU5J10PMA g76In8ohO0Rmjw2+3EQ8sCaUS11hn5Clxrd2r2RhqgUOrNskQbaQpEnNwgUxkA== 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=PrMry7XcyxH+NRcceOX3ckDdPcEQF7ET9fbJO7+ow/A=; b=mZrRxlkeojD/YdGpAm6sGXXQKV7wUU9yHGSeJ/E5ONuI3MjmC6muqqy5jdSV1vIu6GjxS7 3DSmraAYl2Sv3pz1fjtLT1DC8JeAwtskTKPsmzKRZwXVvObFw3xt6bHxLRp1kdl95/c6cT l8K0PAaB19Lu5rYG3LbbRK6Wpc0rFfhAbxwwY8HP4Zy0P9VSGNilimFcSMfkUjy54FYzGu C7T7fK+//hBN6rI+ElO9oPXMckv371mh2YKtsZECPHN79fIFJQXhkuHQ9olxqOripLcVM0 oyrxDNy1xTFWAYu9PQ6QDv/ZEMns1LvoBbA25KBou6sAMqGB7SBo7sqNGsr0qQ== 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 4VdP0N0nXfztyw; 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 44DFhWiJ057140; 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 44DFhWY0057137; Mon, 13 May 2024 15:43:32 GMT (envelope-from git) Date: Mon, 13 May 2024 15:43:32 GMT Message-Id: <202405131543.44DFhWY0057137@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: 75a94658d372 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 75a94658d3724e61f25ec3692d2665fce9ead195 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=75a94658d3724e61f25ec3692d2665fce9ead195 commit 75a94658d3724e61f25ec3692d2665fce9ead195 Author: Kristof Provost AuthorDate: 2024-04-26 14:07:38 +0000 Commit: Kristof Provost CommitDate: 2024-05-13 15:41:05 +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 be45746368de..f5ddbba79bfd 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -249,7 +249,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 78d981c2d769..308be03fbd1a 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -60,7 +60,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]; };