From nobody Mon Feb 21 09:18:46 2022 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 1178119D67C9; Mon, 21 Feb 2022 09:18:47 +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 4K2GvB6zRhz4TVn; Mon, 21 Feb 2022 09:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645435127; 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=lIkwb0xL1R6s1Fvy4MOCRuPH3NLNi56CtbuoFGn3OJ0=; b=A3KD6aaitpIXb/mDz6fGVlbMR8HHR5qvcnlT3U7mmqvqMEG9YNTusA2lSXFaek8wFvggCl aKXRlYtIJHNP/kzNCc2z9PwvDTTwEohni9K1aVss/HkKblcoKO9MK/b0ACplI0hMu9Kbns AtJz77vFckYGa5AVyb9/3QlISP1YZEKbBIY8jsJHlbdPeJQDVQFObmItEgU1HKHMp+1eQQ tT1DMruH8wVAI/2UYC/vI6eus7ZbWbPXABmuwtThKegWOS7xVzbT+Lk/O0qDBruTKr5fDo LRdIXF6s/UzGa+EKEP00aFASkp8oTSHojGQqbEluufCc7650gAF0WZ/FCBILFw== 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 CF98B5A89; Mon, 21 Feb 2022 09:18:46 +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 21L9IkW8030727; Mon, 21 Feb 2022 09:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21L9IkWN030726; Mon, 21 Feb 2022 09:18:46 GMT (envelope-from git) Date: Mon, 21 Feb 2022 09:18:46 GMT Message-Id: <202202210918.21L9IkWN030726@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: c0a3b19a825b - stable/12 - pf: fix set_prio after nv conversion 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/12 X-Git-Reftype: branch X-Git-Commit: c0a3b19a825bc3a5b2004aa03b5f70ed1cd54543 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645435127; 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=lIkwb0xL1R6s1Fvy4MOCRuPH3NLNi56CtbuoFGn3OJ0=; b=qpDjtPMHFVsj7ZkrOUZ1uwiX4tCNDlUa/gW0bMZ+CheHa1sLvMAwVgiSTA/gEKiSHv7klf 7lmxmMmu6Ys6YfvqnZBVFo9qi49gT9N6UtyOaxAbOw5Od7Oa26Mu83nyNvLgsrM4+P+hfI rMJIdxS9/de6ipMIhFzrFgrMUI1bJnXUMFB2xJ5nshJwB7gdMi5gKFimwqGHHfWpPSfAZ9 wUjYGfGjGDCssij6B7SHndxsKPLw0l9FSo2kWQH+kHcBTjvZmxckUHX6KJNLGMp1qZLTFf 845TTMgIyCRncRFd11XYI6IcmmwcaMDrhp4nlCsnYYZT8gRbDYHrpebWdybYww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645435127; a=rsa-sha256; cv=none; b=pi3HgJ7+Ce4IboRCRuosIb608w8XBKDH3SIWBvXvT1N+vUv1WbUYoJV5W+M05ORop4H6OL YiPTbcpjL4qn1emeQNYlALLfqReSK1e4FH9jrk5o1IV4FK7yN5vG8cf7cdzIThPIpnZ6Ni rfgFaxd6mN840fBHs40mdcWdDOg4ENHgpm1eB8p98sdXAHlrAdpqOCtshzdNdysFWUcuEJ Fzn2b4/eTD//0GOdwerHDZnBa51Tfzx0O1rSQAtuqGAQm7ABO+1AfzeepY0bmUYoYfbAZj aWsbJomU7jTpy8bWqCh8DyA+lhSkWlE+1Y8sBYbHb7KgTyrkfAcmnSBdVJGH0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a3b19a825bc3a5b2004aa03b5f70ed1cd54543 commit c0a3b19a825bc3a5b2004aa03b5f70ed1cd54543 Author: Franco Fichtner AuthorDate: 2022-02-14 19:26:39 +0000 Commit: Kristof Provost CommitDate: 2022-02-21 09:18:26 +0000 pf: fix set_prio after nv conversion Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34266 (cherry picked from commit 0143a6bb7f634c5984b34db1834313bdb47e6ccd) --- sys/netpfil/pf/pf_nv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index 573544972952..3fda6831754d 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -625,7 +625,7 @@ pf_nvrule_to_krule(const nvlist_t *nvl, struct pf_krule *rule) PFNV_CHK(pf_nvuint8(nvl, "flush", &rule->flush)); PFNV_CHK(pf_nvuint8(nvl, "prio", &rule->prio)); - PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", &rule->prio, 2, NULL)); + PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", rule->set_prio, 2, NULL)); if (nvlist_exists_nvlist(nvl, "divert")) { const nvlist_t *nvldivert = nvlist_get_nvlist(nvl, "divert"); @@ -805,7 +805,7 @@ pf_krule_to_nvrule(struct pf_krule *rule) nvlist_add_number(nvl, "flush", rule->flush); nvlist_add_number(nvl, "prio", rule->prio); - pf_uint8_array_nv(nvl, "set_prio", &rule->prio, 2); + pf_uint8_array_nv(nvl, "set_prio", rule->set_prio, 2); tmp = pf_divert_to_nvdivert(rule); if (tmp == NULL)