From nobody Mon Sep 15 11:54:19 2025 X-Original-To: dev-commits-src-main@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 4cQNjl6sv0z67Fj5; Mon, 15 Sep 2025 11:54:19 +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 4cQNjl5wwRz43vZ; Mon, 15 Sep 2025 11:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757937259; 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=mzZvZKB+72y6P2sLYUtfaCnIrMt4IsK2xQNvd8KEVvQ=; b=Z/EQ9TBXaWy730hpuhk82B9zVKBm4Y7WW6u0vQph9BrCo9jFhh5htecafNIWNHtlSkoFvo bwkSXN8G1VXPV0EwAjrcjQaF6RJ+TEbhLfhWT6IDaELPg2ExYCIL97DNoU1DzHMlVn5nbl J4YGW1S+XByXyMGbTIoWusDHam2yGliGJtKgFeFH0JFAXGzxPuejl4af2DkqHwEaafM70e M/PkTdIWpTKAGc+fuHYKsScKjxoEHTxtLY2nRqXJr9cBHY4Gv6RaIYvBidJol082nEn8QV da3QHfUre8TVNJ2Bq6NWi/wP9mgQ/+IAHZFe5LQHXTvgxjyurSRQF4UTpwxROg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757937259; 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=mzZvZKB+72y6P2sLYUtfaCnIrMt4IsK2xQNvd8KEVvQ=; b=mrv38Yu4MEt4km0WYtR8fXQLnh6DrO5DRXCR1vmbjHD9gdDYv9gsONv7+gHGXwBS+bd+hg DTYqmv3m3r1ZuGCzfHHZRTcYbExN5Vk86GZNCFn1UWqnMa2rQAm2uqQGQdw2yyh9hs/Jci Cx/ukEUv0mB8mg4ROhzoc/ozopYvG/5UIZIfnkrdlDaeG0c0aM9nc9n51ve9yWDxdAz2HF 4+8aNV5vXnL3X2QZ90C0QzZGCXJfELn9ox0o2LUuqBWUKBK58xGIE6MjZBCITuVMI5bJvO Cs1QyLnDpu7Oh7N/VKVdWdN/QwrjBPZEE7mv5SsDbsIHhm8Be7Ci9VlZpAyJyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757937259; a=rsa-sha256; cv=none; b=NuFUB8T2kMvyJ2qJrgXlhYIzazK4NYF+JoulWZPxi9L1ljnrzq9yiwqum1Tkkvrm/EOJks Ep33BV0nvFlGsBDi+GuRLH4JxfMeG4P0ROmB4GxeT+vtBYRiItuGNcHcYntZxiVvrU8AMn FVYcwQzOVJwR8gDegUDtZ9io/xX6FhDzjVzdatOVV9hIEFnmJsVHsj/xMW4P7aSwzudqXY XRGE4yQpGogv5OLJlpO0MR1r6/7o5DurFbHMP2A0u7onRc6vT4429o8bLpdJxmyQWn6+t3 opQqTrcsQ3u6K4FWl8yEm05+fels6Exh8viiTd4pmvRKQhLPwcH4P8f+DQY7xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQNjl5PRLztJP; Mon, 15 Sep 2025 11:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FBsJDe025279; Mon, 15 Sep 2025 11:54:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FBsJks025276; Mon, 15 Sep 2025 11:54:19 GMT (envelope-from git) Date: Mon, 15 Sep 2025 11:54:19 GMT Message-Id: <202509151154.58FBsJks025276@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: c2d03a920ec7 - main - pfctl: fix anchortypes bounds test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c2d03a920ec75c431f0c6af0ad9cb6ae43e48dda Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2d03a920ec75c431f0c6af0ad9cb6ae43e48dda commit c2d03a920ec75c431f0c6af0ad9cb6ae43e48dda Author: Kristof Provost AuthorDate: 2025-08-20 14:26:00 +0000 Commit: Kristof Provost CommitDate: 2025-09-15 09:32:33 +0000 pfctl: fix anchortypes bounds test found by "buffer overflow 'anchortypes' 10 <= 12" smatch error feedback and ok sashan@, ok miod@ on an earlier version Obtained from: OpenBSD, jsg , 730c5d0121 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index ce58e0636022..6df7af0cc574 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -853,21 +853,22 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer if (verbose) printf("@%d ", r->nr); - if (r->action == PF_MATCH) - printf("match"); - else if (r->action > PF_NORDR) - printf("action(%d)", r->action); - else if (anchor_call[0]) { - p = strrchr(anchor_call, '/'); - if (p ? p[1] == '_' : anchor_call[0] == '_') - printf("%s", anchortypes[r->action]); - else - printf("%s \"%s\"", anchortypes[r->action], - anchor_call); + if (anchor_call[0]) { + if (r->action >= nitems(anchortypes)) { + printf("anchor(%d)", r->action); + } else { + p = strrchr(anchor_call, '/'); + if (p ? p[1] == '_' : anchor_call[0] == '_') + printf("%s", anchortypes[r->action]); + else + printf("%s \"%s\"", anchortypes[r->action], + anchor_call); + } } else { - printf("%s", actiontypes[r->action]); - if (r->natpass) - printf(" pass"); + if (r->action >= nitems(actiontypes)) + printf("action(%d)", r->action); + else + printf("%s", actiontypes[r->action]); } if (r->action == PF_DROP) { if (r->rule_flag & PFRULE_RETURN)