From nobody Mon Dec 15 14:16:17 2025 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 4dVMYY4n1Zz6KmmC for ; Mon, 15 Dec 2025 14:16:17 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVMYY0h2rz3MDk for ; Mon, 15 Dec 2025 14:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808177; 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=pVna5Bgvpc/W4ErgQWhTtA+ZD8WMHfmFIVxxwhpu+oQ=; b=vm988OVur6ackjR7Z1Rhy94eCv8zcjUCunFtU5L+WDmmv1z8+WB5FuicrkapsOgzUpkEw8 nOtOVzlWfjI0MAIumMZE3hRx3u3l0/DaeXj37TPv781mKOdyLOLNyP6mDIxpVyM7ouSYeO pqz0K+BHhDCcz00MqFbMSWFQU268KYAZNJ+w0XDBPwhNP2Qcl54o5bgGtGKyY6KMhRavO+ EEHgDj9Ph53j/xs7vm0P6MzHJEEF1eZEjbGwlpG0fU6HQLVNPKErAGOzjFJ0TxPWcX8Ztk J9uPCxjpRBxvYQ7DyJ/TxzJo0SZXzg1hADMwuTgo1LRGkTjOluW07hA9bm4MoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765808177; 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=pVna5Bgvpc/W4ErgQWhTtA+ZD8WMHfmFIVxxwhpu+oQ=; b=EgqE7C7+gYucOOk18xiv+ZiSmiirLGologQFBnWY5aZz+GKaJe43oC1EfMhKloSdRwpM// eb3JDQ/5AyiVmQHrUlEMVmnOGqAYMQ/jjKl4FBJgxkuLLx21IXo1UYJwB297FlSSO+hQ/c XZh7dE+lsrOX9xDfwrUJwtttCJ9ut6zMfr+sXDao5MLExjswk8qMWepgPGCr2yBYrVl91q haLTK0ghZY/XruUZ4YmTEwp+xM35GwGMbUP9GeUImL5BkzCNGfcWJbCnLsGbcZVj1cboFM +weEurkuPUa7aEyvqueopoEDQGilSkdTzxNPzPurI6pzuz0JITo4OPo/zp2OTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765808177; a=rsa-sha256; cv=none; b=Jnsiq5AoRTF/+ayB/pUCbpCKsx/zsz9gdfDAeN3P9jXbaPbkIfN5UTAkxrUjHZ/EEvBm2c aKuXbXKm0Pd1kwu969mZH5m2cXNZcnw2RsMXkJ1ny5Y6meM6B9+94Mna0GPOcMvJ1inWAt QdHYaGYe061ZdqsYziE+4v8dnpYsllweisqhQhvqxUkk7jrXwPQtCGFWUinxEJuQHRud+N xteHC2vRSUCMiJZJ13nHEEqfoKyVd5PpyLBVbrIcaUdtyZJ6tfzuBYLQXhEuaw/QIqtFsM yehsKCIH89JBT8Y0HlltaaozlHZNBtpjjhyYta45Y0mEu5KsLGOcYpM81cfWaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVMYY0CdYz7lp for ; Mon, 15 Dec 2025 14:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35176 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 14:16:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1910f18b00fc - stable/15 - pf: Fix error handling in pf_handle_get_tstats() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1910f18b00fcda5e5b64087d5da140bc2ec7f779 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 14:16:17 +0000 Message-Id: <69401831.35176.5951a660@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1910f18b00fcda5e5b64087d5da140bc2ec7f779 commit 1910f18b00fcda5e5b64087d5da140bc2ec7f779 Author: Mark Johnston AuthorDate: 2025-12-08 14:09:02 +0000 Commit: Mark Johnston CommitDate: 2025-12-15 14:10:13 +0000 pf: Fix error handling in pf_handle_get_tstats() - pfr_table_count() can return an error. - We must check for failure from mallocarray(M_NOWAIT). Fixes: 9e8d2962aad3 ("pf: convert DIOCRGETTSTATS to netlink") Reported by: Kevin Day Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54094 (cherry picked from commit 0f0662c6b4cc611d6e400f823656f908ffce5c04) --- sys/netpfil/pf/pf_nl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 98d79729fb18..9fc3c67bfb58 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1950,8 +1950,18 @@ pf_handle_get_tstats(struct nlmsghdr *hdr, struct nl_pstate *npt) PF_RULES_RLOCK(); n = pfr_table_count(&attrs.pfrio_table, attrs.pfrio_flags); + if (n < 0) { + PF_RULES_RUNLOCK(); + PF_TABLE_STATS_UNLOCK(); + return (EINVAL); + } pfrtstats = mallocarray(n, sizeof(struct pfr_tstats), M_PF, M_NOWAIT | M_ZERO); + if (pfrtstats == NULL) { + PF_RULES_RUNLOCK(); + PF_TABLE_STATS_UNLOCK(); + return (ENOMEM); + } error = pfr_get_tstats(&attrs.pfrio_table, pfrtstats, &n, attrs.pfrio_flags | PFR_FLAG_USERIOCTL);