From nobody Tue Jan 31 09:31:13 2023 X-Original-To: dev-commits-src-branches@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 4P5ftp0wCMz3bxX3; Tue, 31 Jan 2023 09:31:14 +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 4P5ftp05lgz4CMP; Tue, 31 Jan 2023 09:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675157474; 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=naMDB7IkVj/NxWrCvzygz0u2qZBH3WVu0l0cOLKQSbc=; b=XnETuquS/SJ0or5VejrfaG/s2vrV9eXrYMpnK/hoKY2RYRmav+a2indp5AqyUTxKQFQvHy gkuB4S+Uwhyix5vldFTFLuP1vuCJqHs7nwgh62nXu452jFBU3MIRH1LxXcN4dou2jzu8O8 61aMKomD9+Nr77dsBJ68KTgYAuBgcfPkJ8F10GxYBnqL8TVvVhvIHwQWQ90RdsSIctEjhJ 3HTM8bnIkbT71ArL4rOqWYEgNdTyfFVq/EUuXgbQoD4u/oRgA87kNVZAiMgRelB2KpdwhX 0Zbd22Yl1VIOZT62NTgdIob2qAfcEbSXr0IA+sFdtmUPF7AsakVtGKHSF67D4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675157474; 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=naMDB7IkVj/NxWrCvzygz0u2qZBH3WVu0l0cOLKQSbc=; b=IwHXwb3HsvfsODIxzkntBOJOQ5tOY+/n+xhe1IiZh1x4bwqUS41Kdvb/HI5uw+krxh/E3r gsb/ECQALMakFqy/TEiFuLTP1mq10gk+q98yT8f3n5mMTKEVr+wolAKP8Y5fk7UNyQrmwJ uKy/2/Jx5N2f2hBkNw2ILYLCpU8ZTGzRxdmzmsFD5ZVnxTGX7RnCRpZdbiBnQ5k2nWpBMH d4l08qkXHG6xBOw+gm7DDjbOtjQ4oAwU6w3BaM7zgZuS1cNCAF91/uD+GoiAru9/UPMJgU rx+gf2dlGK/ggrvgwa4Sc4c1iAFV5Sk3Qe9lRi85WDijapKfL5UQtTXEgsoAtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675157474; a=rsa-sha256; cv=none; b=wlfZG6PRyMngqW5QeOHT3i5mRwOPuA312UpE3gd9ph8j/1XRBxoDb/bij69LqK7eyVbFNX KDjCA/jqI0dxRJZuSRlWB7yzX8xU+zfZFTGFzlmb3iwo1c8tqiZhhHNf788VzInjZFPWzv VN2aP3mwnfwe/coTJ89NysibDDlqgH7a11LHdvI4s3qk15u3DyKBo0+yt+lfZSg2G5hOyB O8qBxsD+nlxs7Sv/0W46DQ3a5j5kQ7vng0h6BpP6uHLRKbRBfd/7Cwudf1kCq07gB6xKHO YOWnSzGc+H/kbe+D0ixXh0QOz01Es3Get+b+75/pU9+Q2s9zA00v5UyCoeIGCw== 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 4P5ftn6FxQzk3k; Tue, 31 Jan 2023 09:31:13 +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 30V9VDj3022980; Tue, 31 Jan 2023 09:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V9VDI0022979; Tue, 31 Jan 2023 09:31:13 GMT (envelope-from git) Date: Tue, 31 Jan 2023 09:31:13 GMT Message-Id: <202301310931.30V9VDI0022979@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: f8986380049a - stable/13 - pfctl: rule.label is a two-dimensional array List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f8986380049a998e78acf08a19db3c92edc78a88 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f8986380049a998e78acf08a19db3c92edc78a88 commit f8986380049a998e78acf08a19db3c92edc78a88 Author: Kristof Provost AuthorDate: 2023-01-24 06:46:46 +0000 Commit: Kristof Provost CommitDate: 2023-01-31 03:29:47 +0000 pfctl: rule.label is a two-dimensional array Fix checking for a non-empty first string. PR: 269075 MFC after: 1 week Reported by: nreilly@blackberry.com (cherry picked from commit cd80c52cade3e38d273eecec6f9b0a7cba23bcc8) --- sbin/pfctl/pfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 5b170219e2ab..6fb7aeb45d00 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1130,7 +1130,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, case PFCTL_SHOW_LABELS: break; case PFCTL_SHOW_RULES: - if (rule.label[0] && (opts & PF_OPT_SHOWALL)) + if (rule.label[0][0] && (opts & PF_OPT_SHOWALL)) labels = 1; print_rule(&rule, anchor_call, rule_numbers, numeric); printf("\n"); @@ -1184,7 +1184,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, break; } case PFCTL_SHOW_RULES: - if (rule.label[0] && (opts & PF_OPT_SHOWALL)) + if (rule.label[0][0] && (opts & PF_OPT_SHOWALL)) labels = 1; INDENT(depth, !(opts & PF_OPT_VERBOSE)); print_rule(&rule, anchor_call, rule_numbers, numeric);