From nobody Fri Feb 18 10:46:06 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 085B519CD928; Fri, 18 Feb 2022 10:46:07 +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 4K0SzL4x7Xz4Tnd; Fri, 18 Feb 2022 10:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645181166; 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=BXUYx66N6e5dghLk8aJWV6vEbZNRFIeJav3T9QddnM0=; b=WZyMMZU8wfGFzpcRCUKw0UDmj0nRz47Z3yCP/NFPau+GKEHKWNnEE1QbDSQ9qtOvFLbecW YoADbIQVBfVsa/iphoU6cIpF+XLWoPMblMVMPYwERtIcc1f5yYzPR7uL4PdmL7vg2vLdDG 0LmYQC7MEStKP2f1TyU8prdy8aHxFsx74TF2B2oag3QNb0bdihCDInVl3TXsn+LCOtLBu+ 9fCUXjSJyPNDj7pqhb/x1sItivN2OuRQf7hqCwsojQBNN/I987VKeFI0rul84Vj0isVVHw M8nfXqFIe7uFXzl9D5HtEmCh5LZjSwDCParHeJgE6+lxFUFoCZHatwsc26u16w== 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 52FEE1C290; Fri, 18 Feb 2022 10:46:06 +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 21IAk6PP043354; Fri, 18 Feb 2022 10:46:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IAk6E7043353; Fri, 18 Feb 2022 10:46:06 GMT (envelope-from git) Date: Fri, 18 Feb 2022 10:46:06 GMT Message-Id: <202202181046.21IAk6E7043353@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: c428292cb376 - stable/13 - libpfctl: fix pfctl_kill_states() 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: c428292cb3768d913eda6d546ece59379b6277d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645181166; 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=BXUYx66N6e5dghLk8aJWV6vEbZNRFIeJav3T9QddnM0=; b=nrHoaX/uDVAq05QldbvFHwwBsx3YPkbHvm4MZyqxgEiMF266TfszeqD6qSvrU611xZbUT6 SXQN8QGqL6R/MiBi5W2tPzosEkJ4CTEQvJpFzkgyASE8sO/lfiTTWkB+cdtLqzPCDmWWc4 Q8muqt0Mbg+7N4xZ66Bi6k+Byytot/HrOFChAiBiUnPSnYbPxRKS/DwmiYpitSDnNB6UY5 fQlR9by9H6HZSe3dluPjX3w4N1hlMp9AYQVCMU6mpixgre80LN76rG+r61/FVwMgj+/+Er 1tz5pjLV5NFclyPAiVNOkBkWYq9DFMku20vHEx25lPSsXuYwTfR4I3PnJupU+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645181166; a=rsa-sha256; cv=none; b=PwVrGLGkFzF5VexvndFoQ7msF/TfBhR+Zn3ymM/vln8bURTlq3vYj3NleV0jneymzeST1G Cr83uPtX/MKi4rbXz5isQcbbr7JdlnpFcAARJ3XMjlhqvfzS+seszGcloEUApFllIhSQD0 SLp8UaJXHx9xTlFnpfZSGg+5Ky/y/VZiN82NhEU4fvB/+5WujXhK7DCcTNxnkTyE61MxdF guAABhSSHScN/F5kknsOuBfaDWzv+b5zgRWyCLncrrmcNqTjiSdXlQqGqaVl1ejPKKCxIc aj94Nu/skUhmj3yFVfrT27nQZEdBLeY5V+WRJ4ovhJKDOrRb5ijh/tcLCgjFOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c428292cb3768d913eda6d546ece59379b6277d5 commit c428292cb3768d913eda6d546ece59379b6277d5 Author: Kristof Provost AuthorDate: 2022-01-31 17:31:53 +0000 Commit: Kristof Provost CommitDate: 2022-02-18 10:14:59 +0000 libpfctl: fix pfctl_kill_states() 735748f30a changed the output of the states so that the creator id endianness would be consistent. This means that we need to convert the host endianness creatorid back to big-endian before we give it to the kernel. MFC after: 3 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6f47a72d8ebf444641bda192b33eb217c9013811) --- 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 e77bdee93deb..61fce7d743f6 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -758,7 +758,7 @@ pfctl_nv_add_state_cmp(nvlist_t *nvl, const char *name, nv = nvlist_create(0); nvlist_add_number(nv, "id", cmp->id); - nvlist_add_number(nv, "creatorid", cmp->creatorid); + nvlist_add_number(nv, "creatorid", htonl(cmp->creatorid)); nvlist_add_number(nv, "direction", cmp->direction); nvlist_add_nvlist(nvl, name, nv);