From nobody Fri Feb 18 10:46:06 2022 X-Original-To: dev-commits-src-all@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 EC8DE19CD6E3; 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 4K0SzM1gr8z4Tvj; Fri, 18 Feb 2022 10:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645181167; 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=sKQy1OuGKPt7uiYyb42mVQOVR8EIUTKjUTB9rX2W6aM=; b=U+ori1Dfkny8kHz4uy9WP721QLmww1DO0OS5KKt+mrCP6S0Cmttmuu5CbziiVOjKlyrRTQ 3qFfC4WPMJuTaalOyrlb8jOB1PmqTywCgyaAkS8hD7GYT04vuUoWGQsJvo3ncjiEEIc+9H Bijf61r47w5ckU4OSkZnMpSOHji4nQupcns6+oPwrMRD43IuCeo2UKKDEn7sKTLZvHq6Do vS05ryr8hEfJwRfx7zX208NEdat/avW/F6eMx8FugJBT+XxyofoQyxgX3/SH7WHbCYV27U uEdYi0sKdQf5eOA+TlT/MHET4e6Q/ozNOib7C8BpjRVTiKWa8a6oHCY5xXFOWw== 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 029841C291; Fri, 18 Feb 2022 10:46:07 +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 21IAk6p0043383; 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 21IAk67Z043381; Fri, 18 Feb 2022 10:46:06 GMT (envelope-from git) Date: Fri, 18 Feb 2022 10:46:06 GMT Message-Id: <202202181046.21IAk67Z043381@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: 5746abf94eb3 - stable/12 - libpfctl: fix pfctl_kill_states() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5746abf94eb38259e1be49d0b28f8d08143b2de4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645181167; 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=sKQy1OuGKPt7uiYyb42mVQOVR8EIUTKjUTB9rX2W6aM=; b=SSRgRqoqPqNMKUN+urP633lP+35JwWHMqE7LkOReC0LzETJLI2Zp66yI0b5Lcpd8bRpkR7 LqvEOnZFSPavBguJXcoXl+qT4Oftj5D3Os0r7ro9MV8lhjgRbn/DiuIrqoa/b7ADTC9ZTu eUlCT9kb0Hl2zt2CE+uqszre5rFwcRrOkSu25dSAUE+NnaUcr+b4Q4O2QTtDwfTMNzQ5yA hPrONOS1ni5Ec+vEc89VAdAlIqlHgIFj6BucneqJPJ6vSmQec9XUhUN4FCVE5xFlLfHjb8 IjvH4RnQhyzFfnwz8rR2t4ykxLdZ179q0digupABzWfqzSt8DsTAYiZwTc48wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645181167; a=rsa-sha256; cv=none; b=WYLIPNOvC0LQeaDnsWxIoscRLlSjWyQfrE8C8OmJg2UpdHpPm1oJ23DButz/dwSr14/ZXZ jAA82JnLEE9uW8GpqxDWAchZTt0jUQWmQaErpe+i8kdrMhgYyCRLxlmshids5oDlO7F660 5Jc40fhV4GasiyQf3vAvHBy+yVXCRI1NxyDfOKON8yVM0eAZJ3QJZTL36Cg31ZyJ+ATccl 3CF6TFUDtL34mCIg6BSiBn4uO2kZqoVoI/Oj7DTpOvZgaRDtR4gXqsPcQBlPu6Kt5dZtbm dul6B41DN1tOibjT8vx5uUCe65D+nnbPchOVi6SPtPLogzprQ39YGIrqSSnU0w== 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=5746abf94eb38259e1be49d0b28f8d08143b2de4 commit 5746abf94eb38259e1be49d0b28f8d08143b2de4 Author: Kristof Provost AuthorDate: 2022-01-31 17:31:53 +0000 Commit: Kristof Provost CommitDate: 2022-02-18 10:15:31 +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);