From nobody Thu Mar 24 13:15:52 2022 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 60DF01A39F45; Thu, 24 Mar 2022 13:15:53 +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 4KPQhT0vjhz3NT0; Thu, 24 Mar 2022 13:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127753; 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=6YVTA0c0T2esAqxZvXZM7kD7vyinCvIZTPj/wULGCo8=; b=SyPGBuFUuy7POBgeVXGrlQxiXjTXhn72R79r7PL+bd+LNZM9XlJ6s1SCzsWgYhTa0Jl91Z 7N31lg59rNoE2ItSnnYKAs5DmzJEWn43XLCuXA39ugz+qjCLmJ7lVv6aLl48z3pIQDrsRj 8UE8K+BtfY+ulzGzo6KGXx8X4HRz5Z+OWUHlCPzy0zwtVe2OEwGpNWPjalmGZ/iNiX6ZoE mgnyfF67n+hV/1GjD5sz5CK/7nXTfOYBcO2/LnbL64PLK8QMTRccHNHoviXcrp4kGtRWKX 7IGeuQ6X0WUuYPtKCpVukQOPM+KY4E+f+I1oF8M9a8ovw2crgN1lcmCwX/Z4+g== 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 DA490184C4; Thu, 24 Mar 2022 13:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22ODFqpU032386; Thu, 24 Mar 2022 13:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODFq2C032385; Thu, 24 Mar 2022 13:15:52 GMT (envelope-from git) Date: Thu, 24 Mar 2022 13:15:52 GMT Message-Id: <202203241315.22ODFq2C032385@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: 73b72d4a71c1 - stable/13 - pfctl: fix retrieving nested nat-anchors 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 73b72d4a71c1d173279dd0cb7dd9eec3790e71b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127753; 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=6YVTA0c0T2esAqxZvXZM7kD7vyinCvIZTPj/wULGCo8=; b=VdImmPAVYBiIJgHF9DHxv1OBnnu8Nx7ehER0G6Jg39zWdAvwGs3WOPXi3RNQYHNlGQuKkp WVAE6+kPORGWa6Jp10HbUZByucKonazPSxHlBkkz5N8GqbDuouzeMZh21riNeyIATzFbRA r8mQHRit5IfwN8gXVSemhS5zAD4yWxhk2hhbCNDrfABLoK8tN5FrfAzG9MrSBhjNlQgfFA AaWnorxzIrCKpAmthraJZvurUqeV0WL6sqAitDGwDRyuqYJNyNtcjY4+pltA/qIYctz1Gw loEBoYvqBjlseRjt5nNHD1FhdyPq85zvY+dI7Q7RDa/6Ic3etu0A/LVwUH5QYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648127753; a=rsa-sha256; cv=none; b=E03NY9X47ejaFEW6hGBfXFIhWzszL1v99clYy2f09HvOhQrYelrTj448kL5Q6hMopQST0x +s8R4C2LqQB9q+4SXul79odzGHl8PtBisXHhqtoKzIiNtPCVKTmVaKRxxajCW90RX9RpJ2 Q2yoJ2AvBPDMNEaN2lJlV9A3ZANvWl4hoYKMSpsLFcdrAZf06jd+4IaBvGBTIytBzl/vfO 6lcRwbNWcrycmHJCajbk8gsRZImfO/HHw72oIYhiEEYK7xOAw1jsc70BryIMQ0+kF1vaXo HOznDS41hWi45WLmi6hsAfhninuy2Onulqzjte3v55HQRsi9zM0nwAhONgPf6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=73b72d4a71c1d173279dd0cb7dd9eec3790e71b0 commit 73b72d4a71c1d173279dd0cb7dd9eec3790e71b0 Author: Kristof Provost AuthorDate: 2022-03-17 17:31:37 +0000 Commit: Kristof Provost CommitDate: 2022-03-24 09:44:48 +0000 pfctl: fix retrieving nested nat-anchors When retrieving nat rules in anchors we need to set the path just like we do for regular rules. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit a632d9e3601272c0157dce6633fc9a23ad6ae45b) --- sbin/pfctl/pfctl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 17bd61fbccb2..eccfe319207e 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1187,10 +1187,16 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; int brace, ret; + int len = strlen(path); char *p; + if (path[0]) + snprintf(&path[len], MAXPATHLEN - len, "/%s", anchorname); + else + snprintf(&path[len], MAXPATHLEN - len, "%s", anchorname); + for (i = 0; i < 3; i++) { - ret = pfctl_get_rules_info(dev, &ri, nattype[i], anchorname); + ret = pfctl_get_rules_info(dev, &ri, nattype[i], path); if (ret != 0) { warn("DIOCGETRULES"); return (-1); @@ -1199,13 +1205,13 @@ pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) brace = 0; INDENT(depth, !(opts & PF_OPT_VERBOSE)); - if (pfctl_get_rule(dev, nr, ri.ticket, anchorname, + if (pfctl_get_rule(dev, nr, ri.ticket, path, nattype[i], &rule, anchor_call)) { warn("DIOCGETRULE"); return (-1); } if (pfctl_get_pool(dev, &rule.rpool, nr, - ri.ticket, nattype[i], anchorname) != 0) + ri.ticket, nattype[i], path) != 0) return (-1); if (anchor_call[0] &&