From nobody Thu Mar 17 21:38:42 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 B19101A259D4; Thu, 17 Mar 2022 21:38:42 +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 4KKL9t2vxCz3sKF; Thu, 17 Mar 2022 21:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647553122; 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=9GtQB7oijH6mfNxCv2nVaJskUbLyaDbAMeAXEoeAY4k=; b=ZtJVHnD6TQruIGV/Tys71824sd3jpU/MjQIDA/Ya+1xWSa6FWtzXJrniR62HyhdfUjugnW W/xiENZIMg9zffs5FTMo60Jr0thmjoJPvV45RR0QTgmNmH2q493T2k8eFUOZJ1nLhsdjOf A0Vo/qZ7VpUXC7qi8cK11KTS7Y4dNiP8ZY/nFPrym5jp3nXAaJrzooK5GANp1EvMdyx/D0 OM01j/+Gg2F9wRPXhGb9dZs77QWZ1yBPqiEyzV+b0NOvF+4oqssWZgtXaj+EpOuxTjZwUy kRqtkg2Gsso8acAX9/w8Z03CHMQrJeAjkNHOwkRtYS2Inuer99OwiDaKRi86dQ== 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 2C3D01294E; Thu, 17 Mar 2022 21:38:42 +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 22HLcgCj024155; Thu, 17 Mar 2022 21:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HLcgGE024154; Thu, 17 Mar 2022 21:38:42 GMT (envelope-from git) Date: Thu, 17 Mar 2022 21:38:42 GMT Message-Id: <202203172138.22HLcgGE024154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a632d9e36012 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a632d9e3601272c0157dce6633fc9a23ad6ae45b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647553122; 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=9GtQB7oijH6mfNxCv2nVaJskUbLyaDbAMeAXEoeAY4k=; b=QqHaJTaHvqQ5qbTifFEq9ieW75MCWNPYjssDyiOGY19XYr9f8vvKJjtGFKq6Vrm2jOF6Id QxxcGM5WqK3+IJ0j5wTOkrCVHwsjWAeGWQfbeHz9GaSBjvefbqWSG/Mv4BzfZpS3QIaUQ+ LBOX220raNd2LOmMIYqm4iZ7at2NuflyBl6+lCeh2MgbF8qZOllfqdFJ2IGRip3pZlo1mW G7GlCETRB2UeZlhlUjfTwXQ+9M+KbMUE3Dcb8Tonjfrx5ihWCEq2AwQTHFbiyU6lwf1GI8 5SZvRyCnP1rKAbRoUn/kFSspRIXsSgn7BUaZ0nVRRFMXdF4tg0PfWPpqaBC9fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647553122; a=rsa-sha256; cv=none; b=vnBVzcDSiN782zHHQSkI0TthYlD7r6TeBgNaqxURWtiMHzdcXn7LR462VZEx3UB9w6fTHQ ktFJ9uu2wB/5uqxKDw51hypsiZnHs/dkB/oOA+0b8hteHRQ9l/y3dl73+4nR2aw5f+TTDN SlhDjIhb0T79a7jTzyUzQ1XVsRBbYjMfu++WOkO5UBqkmGEH1X00/d3M36+cCuxy33AFHt 4VZ8BiQ4D6gyb71g6V503Q3sPg0YLyqUqb7uaG8XC8eW+LiXeqgDjctM0GAOFM9Evlxb5a 52NQCNfhQFPIFk6J5mCNtlTErsLKvAaQspbgTFZi+D4KGYEGMWD5nmzPbGKc6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a632d9e3601272c0157dce6633fc9a23ad6ae45b commit a632d9e3601272c0157dce6633fc9a23ad6ae45b Author: Kristof Provost AuthorDate: 2022-03-17 17:31:37 +0000 Commit: Kristof Provost CommitDate: 2022-03-17 21:37:06 +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") --- 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 4632d2dc3946..88a96bd303a0 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1291,10 +1291,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); @@ -1303,13 +1309,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] &&