git: 83dbbe8295ff - stable/13 - libpfctl: fix label setting

From: Kristof Provost <>
Date: Fri, 10 Nov 2023 11:53:07 UTC
The branch stable/13 has been updated by kp:


commit 83dbbe8295ff0bb06a8f6b621c25d8224b026b77
Author:     Franco Fichtner <>
AuthorDate: 2023-11-10 11:42:17 +0000
Commit:     Kristof Provost <>
CommitDate: 2023-11-10 11:47:44 +0000

    libpfctl: fix label setting
    A mismerge caused the labels list to be added to the wrong nvlist,
    breaking label configuration.
    If you compare the change from from main and stable/13 you
    can see that main uses "nvl" and stable/13 has "nlvr" for
    nvlist_append_string_array() but the backport changes it to "nlv".
    This code was supposed to apply to pfctl_add_eth_rule() but instead
    applied to pfctl_add_rule() for otherwise interesting reasons.  Since
    pfctl_add_eth_rule() uses "nvl" and pfctl_add_rule() uses "nvlr" but
    also has "nvl" this compiled fine but still broke the label set.
    Direct commit to stable/13.
    PR:             275006
 lib/libpfctl/libpfctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c
index bf25a45b792f..4dec539e250b 100644
--- a/lib/libpfctl/libpfctl.c
+++ b/lib/libpfctl/libpfctl.c
@@ -643,7 +643,7 @@ pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor,
 	labelcount = 0;
 	while (labelcount < PF_RULE_MAX_LABEL_COUNT &&
 	    r->label[labelcount][0] != 0) {
-		nvlist_append_string_array(nvl, "labels",
+		nvlist_append_string_array(nvlr, "labels",