From nobody Fri Sep 27 12:01:10 2024 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 4XFTZZ3FThz5XvRw; Fri, 27 Sep 2024 12:01:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XFTZZ2j5Jz4kCX; Fri, 27 Sep 2024 12:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727438470; 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=8FH9WtBMW61UlTUVHl0kKsOHZI5Q3WCsvrINPnS9Bcs=; b=xDDruZ7w5YO09t1Vk0JK3U44oJ9AkEmRh24zjaRNinDZYVRl369eaiZlUn8+9Kn/JEW7L7 qfo4NlGZ6HpWEMVSLuNa2Gc0wl1hdQ+hK3D4YRQ89A+9of10ogiCw9g1rMuU6+NJrn8RgC oVvxQv9BbMHgepA8P4/xwvoDhKEnPhU0TH1P1VjcuPzbFxeK+yWngesYRYjaXFfqzjo2P5 WoO5VUt4r0/MzNSboLg5atlKW6FW9hvZI/Qxyh7uXu0dRyQnG0JXTfjQYsrr6kmXEw8ABG mcb3kGvOZznitxbimD0MgPtrZSLl0if5KeZsz34csmxvW3qmemrl/GYOklRzgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727438470; 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=8FH9WtBMW61UlTUVHl0kKsOHZI5Q3WCsvrINPnS9Bcs=; b=Cn2g4WmyCTbwwXfDwwY/9gVf64kasMcg4SGMD6p1GDY1EJvLMPXVWeBcHIA44QOGqlyxBM x0KlJEVRumSyJeBlDtEMy4+y6x2d0Ty04rMjLRAakMt2UMn6JkxT8+yzkbnFpIZpjM4q1r 2zUIzxAsX/rw+6UWi2/pltVNFAQ2C5ZWcx/Q9ZPYpEE1VUmOs5OBxImFQwMhXjf6C4IH+1 IwLE2Xhbb/CfKMGXAnpfSGtNLJHY9ludbtjEN28igStwsfwIDjoutwO8Ez4Bhk3bvYtlAJ DENungBDM/IcnVcQ9qVbKxXx1JNnfZ3FnA12REPwk55E/ZKbxP5zxaUPl+bsww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727438470; a=rsa-sha256; cv=none; b=OPRc48mWI+uJACmB0MJK4GBk+MyR3mVy+ctfu8/o73eRmjx8E78jdSjV6PAg1jC6aGiujx EW1m1d0X2EFp9hQclIqqxcf/x4OmZ1ozs7OIR4V5hp2Qy3Pu2D2daro49czqxGeUGUdoL2 0Di0y5U2r6+b540Q2bARoHX41x1KKO167vjR0EVxmMlJ9LKc8IC5qIfZ1tgUGD6vmiXcYx U9x4Lsj814zK76tq4OpsUKSXgIBLheWUq+bOHJuaQNunZAW0IzkA+xJCxEhLauOo93BdTk lA++rk5X3duyuFS6byeFVhUEXxkml2vPjfotg2RLd1u7LNim5xaD7+7RuXIY5A== 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 4XFTZZ2JhJzfwP; Fri, 27 Sep 2024 12:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48RC1Aw4097822; Fri, 27 Sep 2024 12:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48RC1Anr097819; Fri, 27 Sep 2024 12:01:10 GMT (envelope-from git) Date: Fri, 27 Sep 2024 12:01:10 GMT Message-Id: <202409271201.48RC1Anr097819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e8ff5e565c24 - main - pf: fix incorrect parsing of state export filter 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: e8ff5e565c24d7e3fdd607e76769b4c879668759 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8ff5e565c24d7e3fdd607e76769b4c879668759 commit e8ff5e565c24d7e3fdd607e76769b4c879668759 Author: Kristof Provost AuthorDate: 2024-09-26 18:00:25 +0000 Commit: Kristof Provost CommitDate: 2024-09-27 09:50:00 +0000 pf: fix incorrect parsing of state export filter We saved the af parameter to the proto field. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_nl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 510aac2af48a..62d5972c4abb 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -68,7 +68,7 @@ static const struct nlattr_parser nla_p_state[] = { { .type = PF_ST_ID, .off = _OUT(id), .cb = nlattr_get_uint32 }, { .type = PF_ST_CREATORID, .off = _OUT(creatorid), .cb = nlattr_get_uint32 }, { .type = PF_ST_IFNAME, .arg = (const void *)IFNAMSIZ, .off = _OUT(ifname), .cb = nlattr_get_chara }, - { .type = PF_ST_AF, .off = _OUT(proto), .cb = nlattr_get_uint8 }, + { .type = PF_ST_AF, .off = _OUT(af), .cb = nlattr_get_uint8 }, { .type = PF_ST_PROTO, .off = _OUT(proto), .cb = nlattr_get_uint16 }, { .type = PF_ST_FILTER_ADDR, .off = _OUT(addr), .cb = nlattr_get_in6_addr }, { .type = PF_ST_FILTER_MASK, .off = _OUT(mask), .cb = nlattr_get_in6_addr },