From nobody Mon Sep 23 21:33:16 2024 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 4XCGSX5NVhz5WXvh; Mon, 23 Sep 2024 21:33:16 +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 4XCGSX4gF1z4kpr; Mon, 23 Sep 2024 21:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727127196; 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=dM6E3FUZ/TQQWs/5N8PW5FpipfuZvfNBHxrmVjvdGto=; b=ioFJdun4xhYIbI+lkHfhrCfH/U5/YpzIdRG0L8fU0Kqe5wYfSeY7QWlvTB1Haqi37Htu0S 3AyJ5lPGuSafNM6fNmw1jVjiibSmRZ2qIaDkSpZGYuAVCBj+OBn6x5oKMUuO/0f4ZQQYBB pO4vYvk7LOQ/gtDju6Q6/F362szIMPmQcaZYTdbi2083vTUFJlmg19LfZAylJcW/XrW+N+ Xez69qA0svgJm6wLkZos1TXS67SjQJ+1yH+r5s1qAE8qkx09o1TTn7pHsSHybT6WTaTrdW 6aqRy6NQd4i1w+DZCSipShbbccfO3VO8zRmRRcVYeQJi4bRvV/LEnhJAj8bHgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727127196; a=rsa-sha256; cv=none; b=R/C0njNEXAZZIkPpg+Lxtq4nGgp4ADV9GPXdGwuHk4I/8lZs6XXt4SSNDOH5QMSKslZ9VQ y5BSe0yn5nB+mAUf8ug/2OzBl0i6EeLFp71Dvx8FG1J/buk6xKMIuxL7xUxldnaP4S1d22 WY+cnOnOBorHg+maEJEyZkhu6rYQhpwupVCaQoLFOnr/M5tj4ECVz7HFBSe3Z2mdu8Nc8Q /87dQjqqCOpXOg+0VAF0CNC7UsXi5ItBGQ93ZjMGLAzx+1XZJnd4Qz5RRFrTpdg778Pyjo aW08tXXiQ41xas9X+L7PAs31YdynIOxoL4b24kG3+87XvgnP3stpMIX0RR8PZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727127196; 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=dM6E3FUZ/TQQWs/5N8PW5FpipfuZvfNBHxrmVjvdGto=; b=iGpBOaX0p3ySNeLyxZ1DGfiPNqDodEurhIj2rGJIVPaSDPoZVwB3Zx/MtE33L0p9HaXYlY gi63HmCrc+ZsKJ3WqfKBN9ZKFmKME/su7cefTREsZCZ6uRKWaq3F20Hko//YMo+8dgdHvs DzEKcgyKBh+YKNrkV89IiILFfAKbjAxTiUtF3gTQQLkEkgNrgsv04enoVNjCxuC0ZYFFr0 yINyMYACEeV0MSNubt1ZFzIehruANtP6oZHlTdZEkTuTU55H0YCzqIBwa1pF3YZIDL+3zB ZXunVaZplsz9Jn/V1dmTQFcxiqVvat+NlvfAMT40OK0ChMk7rUxG/0t4ERBhNQ== 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 4XCGSX4CYTz11N8; Mon, 23 Sep 2024 21:33:16 +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 48NLXGRL075281; Mon, 23 Sep 2024 21:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48NLXGBo075278; Mon, 23 Sep 2024 21:33:16 GMT (envelope-from git) Date: Mon, 23 Sep 2024 21:33:16 GMT Message-Id: <202409232133.48NLXGBo075278@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: 5dd89e6b6777 - stable/13 - pf: use AF_INET6 when comparing IPv6 addresses 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 5dd89e6b6777f40dd0fe329b64470e25f7a5784b Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5dd89e6b6777f40dd0fe329b64470e25f7a5784b commit 5dd89e6b6777f40dd0fe329b64470e25f7a5784b Author: Kristof Provost AuthorDate: 2024-08-28 13:40:42 +0000 Commit: Kristof Provost CommitDate: 2024-09-23 15:09:37 +0000 pf: use AF_INET6 when comparing IPv6 addresses Reviewed by: zlei MFC after: 1 week Obtained from: OpenBSD, henning , cf7c0bf78a Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46576 (cherry picked from commit 50ecaf1bd46a834c4fdaf483eb39df7bb62501e3) --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f940950a2479..810966f88a89 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6821,10 +6821,10 @@ pf_test_state_other(struct pf_kstate **state, int direction, struct pfi_kkif *ki #endif /* INET */ #ifdef INET6 case AF_INET6: - if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], AF_INET)) + if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], AF_INET6)) PF_ACPY(pd->src, &nk->addr[pd->sidx], pd->af); - if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], AF_INET)) + if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], AF_INET6)) PF_ACPY(pd->dst, &nk->addr[pd->didx], pd->af); #endif /* INET6 */ }