From nobody Thu May 28 11:37:33 2026 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 4gR4Gq0RnFz6fZpR for ; Thu, 28 May 2026 11:37:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gR4Gp6w3Zz3MsS for ; Thu, 28 May 2026 11:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779968259; 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=yq02nScmxDSuhSMbOjZ5krv0qUCXYjoG0gkT6WB23l8=; b=ynhRFgB5h6m7zyFb5Yw9DowSCNb/8tqyEfMly+YbughzQv+qAhjOhUvEr4cCU3SwnV1kIN e8azJ6fdUYGhLnd+6KGbScrsKe8PE1BirhU3QsvQjKc1FUEL9cIHASWFjCWno2GcxDtUZc ZDwqbSvwxv7wfS9sPFEaoin3iyARbwb241l8LvyqwlctCelSklyRp/hWtovudjsadCC0DT NB+qYW4zJ6lTHmVQOW6uGwx/B6sEOosxjlKGif5ideHKaYiVLpPJbRx8et7DyzivnwcsWi WO3J0wcQLkH7lQdCr5F50Hrsvf+Y8ReDOnGgyXznZUNK2lkUSDVx6g/kWEdJjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779968259; a=rsa-sha256; cv=none; b=RFH/WrejRrPIym4YTqTx0SP/WqpI6EaiotZXIkdwmgHFdjR8D/Cr48vK3l8IzRNis4CX7q DpCLNRS7wNjIc+a/dwIzBGWW6B6LxuEuIaIva8bjvWkiq2Rw5Ey1W4zjXql6ZIcPiGXQ6U pjapBBwfKPHDtIwQirn+rdFr/g0Mg7E+FJOHBLlkRVvkzOZz7c1VUpz/NYdcSxJ2vL/X9i K0sRfkDyxq8XE6L49xM5QuLDBa6BxFMiWeFbpYLRKt0dtDBqWiX2Zqgnx0PF2DMxYwTtvq mKpcShhI+Pdq1CJRneX7kmnO9GmjYfPi4mN1fOKC/SaDerSFlxCAy2NG3DSx+A== 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=1779968259; 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=yq02nScmxDSuhSMbOjZ5krv0qUCXYjoG0gkT6WB23l8=; b=un/wOBpP8BfFjnPZdApXfwMyqUK+ylNicrAGUaAujflLu/O3ADLZmOUF8qhfKYfP6ZMKt4 sIODcjRz/sad6UGbkbtcqT7+phZFqKNQA+ktOb+ynifXieW7jhnY0w80GUcEC60MFqDt6G RtShE5x2iF6uwzrGmjX0OQQCaqDZJlVtKmAsGt5RvViTV0psagDZnU9eQxBXS03Zm4wjgZ 4TYKum1R+uAZoE5cqkcyOgctoqZtR1HXVHyfX+jj7SRtYyIrbz/2R0d9M7kX1olE3rSsk0 Ev4V+MoDhBJ2wKsBRJf38NId077+nXqYZEIURV9Nm+PzYcLC+DDpZqNmKiLBkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR4Gp6Cpjzl0n for ; Thu, 28 May 2026 11:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f9a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 11:37:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 45aaba521c3b - stable/15 - pf: fix incorrect table decoding in netlink 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 45aaba521c3b7abd39dc9e8f5ed0e9521fee57c3 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 11:37:33 +0000 Message-Id: <6a1828fd.3f9a4.542e9e5d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=45aaba521c3b7abd39dc9e8f5ed0e9521fee57c3 commit 45aaba521c3b7abd39dc9e8f5ed0e9521fee57c3 Author: Kristof Provost AuthorDate: 2026-05-21 08:13:24 +0000 Commit: Kristof Provost CommitDate: 2026-05-28 11:36:43 +0000 pf: fix incorrect table decoding in netlink We used nla_p_table for pfr_table structures, but this netlink decoder was intended for pfioc_table and decoded an extra field, outside of pfr_table. This allowed userspace to write (slightly) outside of pfr_table. Use a separate nlattr_parser for pfr_table. PR: 295218 Reported by: Robert Morris MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 64327f769cee0c26e1b81e6195a5092498b10403) --- sys/netpfil/pf/pf_nl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 168c6ac63d90..c09b204bcc66 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -2138,7 +2138,14 @@ nlattr_get_pfr_addr(struct nlattr *nla, struct nl_pstate *npt, const void *arg, return (0); } -NL_DECLARE_ATTR_PARSER(nested_table_parser, nla_p_table); +#define _OUT(_field) offsetof(struct pfr_table, _field) +static const struct nlattr_parser nla_p_pfrtable[] = { + { .type = PF_T_ANCHOR, .off = _OUT(pfrt_anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_T_NAME, .off = _OUT(pfrt_name), .arg = (void *)PF_TABLE_NAME_SIZE, .cb = nlattr_get_chara }, + { .type = PF_T_TABLE_FLAGS, .off = _OUT(pfrt_flags), .cb = nlattr_get_uint32 }, +}; +#undef _OUT +NL_DECLARE_ATTR_PARSER(nested_table_parser, nla_p_pfrtable); #define _OUT(_field) offsetof(struct nl_parsed_table_addrs, _field) static const struct nlattr_parser nla_p_table_addr[] = {