From nobody Mon Sep 23 21:33:17 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 4XCGSY2bm1z5WY38; Mon, 23 Sep 2024 21:33:17 +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 4XCGSY1mqqz4ktn; Mon, 23 Sep 2024 21:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727127197; 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=0aOVRGO0P36ECIxf0hDN9p8+E09OZpvKjOwxbwTC+Jw=; b=kg6XNGFwc95Q2WMq9d1a+1dMbD/DxUApOjCpf1sESDiQ1D/5ATEF8zbQSxg41wav9OVZ0L CzB7n0A68Zm8f2p0iamrV6C2euattxJkaxz+MRckZjlbIos2ustigoBIjK82lbJFLgJS7n 7vHThEZYFsAEzBbAMeGwX1zI9bg9uEIibUjcw8RrpwXHLoNR3+vsH/zylNi1JIS4d8G+hf AHAUDoQGkc5mkralkB4C8/0FO28e/mEmP7Bui8VJ9uI6kO/cUvrg9OpocPvonR7Qt79nv4 rheKKx0IAIjLQtad9GSdHIS2ITMRspINxVkmLleHAIHR7Vcag+e/+dMybMO6iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727127197; a=rsa-sha256; cv=none; b=qt6POby7oPh43j6o3pgc8rz4xiwswxlYDCcy5ahtQMhJszoVKhFWeKRE5vn2bVhA7ieb2x 7ZXsyLqslQGkmpZy4la2uhj36gOlg816WXWdePVo7xiGMiQKquFugb8MwyHEdzI4udyjNe yK6IylOZAkhgMulXvt4tufHTQ5GHzN+9C9ZWjO1Nw/BFlHqUwRxqq+nAjU+80gUgKD/L1F vh1JfJnfxjlKHPJ9JTllhmONp1vkqvS3EpMZ02I86VsWWzl5VEeGxhPhk2Ze0NkUXentz4 j3Sum+fU/IRy3CS0Jm0BUPGuarpn7psN1pwLi2XiN65bIxapmI8/vWgivlSMuw== 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=1727127197; 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=0aOVRGO0P36ECIxf0hDN9p8+E09OZpvKjOwxbwTC+Jw=; b=mzlzxSbC0JCybhABs3rpDwUIMzIiwNnBoQg4rEusx/h/RhIgfxg5ji+EstyWUAgf21lcL4 qSouyM7k1GONuSMBnZMJUto7gC4Pn0CiS2AKe/lFzmImXVYahAP9vwXeAnY0X3487r1sda gG5v9l0FUjF8cKyvsAofWpg386aMfi0JdPE54rYPOiUFFWJRmHN6mnt5n58qtF8A1WAYBJ gOPsaUYEEI2kKYtnDhaOz5F0sI+LU/viYxTDb+Wxb4GNfDeLgXFDZ6Jfl+EPLZtE0eCeOa 9Rq5ypQoOL/mVD5pxT24/5pBKp6h+xlF/TLNW+iDpEnrAVU0dnhCz86f+jHmbQ== 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 4XCGSY1N94z12HS; Mon, 23 Sep 2024 21:33:17 +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 48NLXHI6075385; Mon, 23 Sep 2024 21:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48NLXHK4075382; Mon, 23 Sep 2024 21:33:17 GMT (envelope-from git) Date: Mon, 23 Sep 2024 21:33:17 GMT Message-Id: <202409232133.48NLXHK4075382@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: c5a9d5ff0c0c - stable/14 - pf: use AF_INET6 when comparing IPv6 addresses 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c5a9d5ff0c0cca6b4650e7853580ae3dbd623fd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c5a9d5ff0c0cca6b4650e7853580ae3dbd623fd6 commit c5a9d5ff0c0cca6b4650e7853580ae3dbd623fd6 Author: Kristof Provost AuthorDate: 2024-08-28 13:40:42 +0000 Commit: Kristof Provost CommitDate: 2024-09-23 15:09:42 +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 f4ee8fb3344a..d6541bc6627b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7413,10 +7413,10 @@ pf_test_state_other(struct pf_kstate **state, struct pfi_kkif *kif, #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 */ }