From nobody Mon Dec 8 14:12:03 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 4dQ3nv3XbYz6Js8n for ; Mon, 08 Dec 2025 14:12:03 +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 4dQ3nv1rH7z3nRM for ; Mon, 08 Dec 2025 14:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203123; 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=oTQb7dE6GAvjBcbY+TVYK9qEFvMKQyjQ0/l+KRSCGsg=; b=XOieDJh/MEt2cATALSeGd/psv2dVzPuoil7mQsM34uTPt1FQLfTXIrFa+QmlcZHaAss/Jo RSULjQjMi0rGOHrygXJkaazqyvtIzAH5IBngYiay/9sc+sqYjFQrhBGqKcWom7T3xolmdX 3MzaNQ49Vo+2ZTVJSHXiHOFM3TxLrpnUEb2GH+z/VkaBvtGsXEo8pDuLjrlnQFXFKULy7j zpGl4fAy1zIoPaKGLuo2k3T0861rK4zBpcDUT7qaa8dZDc+OLatoycHUFvmNZL47z/7g4g +xf193CqkzW0gBzlJEvp4Y1rOZagwO+qMTCCen5X1yDtUaqIaEMcEENqgid8Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203123; 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=oTQb7dE6GAvjBcbY+TVYK9qEFvMKQyjQ0/l+KRSCGsg=; b=NRNZ0BmF/sQErQIWxxlO4hndkXGt5kpNub9r2Ih9nOyZKau4o4USDv8Zb/rOef6RFTt7dF oVCkIdBCkah31LVjOb7l1//+jZ3oaxvhqbBmX8dXVrofSuiXfxaOCDFv7FrkPdhrbg9bkw Eje1wTtAsfdew/bgqK5WKeez8j95KTTxg4GJQjcsFENh0u95WAXqeiDW6mc1i2sDm1Ge9p E+Bk6OAC3AxdkCwueQsqJIUUgqB5swP+Ood970SehkqaqOd2MNcG+OmD1AFrVD6iw4q0RT l+MsgWr2I/W9LSwzJtOYl648lN5wqiKdxWhxotKS7NOMe8rR+UfGrPHsqmvAqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203123; a=rsa-sha256; cv=none; b=bjjd9w4LseSoXJ9WxL7uK79aFIm5ILroK9H+lYL7WUn48R+hROHT0fF7w+26ugbhAQcNg7 eGHoLgjTS0wCgZTdcEWVcULHTfdLN1vs2aQi/1svO5I5iMuwPlnBlt+VpSIu68y/jlI6c0 oMJAG+XCuGXGyyRalUFNrjhxrWi6IfFSk/p6Edji018p33MIeGvtA1qvGohmB9deVrjS31 Um7JmAyjo+tIbZ4L0jGlFowSECHjNLSDEUg3DpSCE7s6Nao4N/B+XxVG/g28g+tZjDcKk7 FuBSpZibsx+P53Jz0ULMAZEaWhLHIugxDRDZrKEuwHJToWjQGFgb+qWNela49w== 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 4dQ3nv1PJlz1B1 for ; Mon, 08 Dec 2025 14:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 302f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:12:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0f0662c6b4cc - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0f0662c6b4cc611d6e400f823656f908ffce5c04 Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:12:03 +0000 Message-Id: <6936dcb3.302f0.33fce989@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0f0662c6b4cc611d6e400f823656f908ffce5c04 commit 0f0662c6b4cc611d6e400f823656f908ffce5c04 Author: Mark Johnston AuthorDate: 2025-12-08 14:09:02 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:09:02 +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 --- 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 bd49d0a1850f..8d0c7a2cf543 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1954,8 +1954,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);