From nobody Mon Sep 16 13:05:21 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 4X6lWj37j6z5VxPh; Mon, 16 Sep 2024 13:05:21 +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 4X6lWj2XkRz54Qy; Mon, 16 Sep 2024 13:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726491921; 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=EJRhGTSI+KKMC6mMjEKidCzXNTQGI96nnqqxKEDJw0U=; b=M/yQiv7kcR7Zp03UWSS83QpWzX0ZqAwVHnxcyXdH94djeI6Gc3lOrPojNkJM8oInxtXSMn VtuFOfyLn+oycQPeE5M6LYP7mW6/LG7msTR8nRC5aGLgTHOr5DUBg6hywCcWkspINyOj5X UHNzC3odlbjlAKfuXLqJ1AG/NY3N1toUXXT2xtOfWS1E/zfK+byrlBlR+jzY9FgNe9VpFz xVo+B5gUsyPo8Q4a3NIpYT39VBaU5YTsWo68S7hDSWCSdhZ4hLUXsGwTLOK/H5mS7HVqjJ xU1/slz4E0khry0+PJv5QZv+Esls3b0qg/HJM0aBmQZBVSTtqkATuzA4lpuwHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726491921; a=rsa-sha256; cv=none; b=Q7M5mMz+07+XRaWFZ0jXo/I3mRGBNYf6ZDty17lAcRQo+h4nW0GIj6WEaN6bQZykKM9Zzh iR5CwOIdGvSdM4kl5CQFg0j4LXFE316e6EqYkFE9Q6QUGd4hqaK/E2/8VNmisqHYB5262v Q8wVyuICZiGVR9phw2wtWgDvwrB0HehWSNmDeY+ww7tS2NeHSiOB5eTesBwDHAd442EnTI WWhQl5ame9Ow/ju/y8H76+DVksMvrhYGs5NLYiDo4Jr4d1wZ9MieTyZLmdNDY8Fiu6t2Q9 QCG9eZnBjU8b64Hf0Bl14IEpuujePfbFWu1IWM7A5E/gcGh19gV042JcIQyDiA== 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=1726491921; 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=EJRhGTSI+KKMC6mMjEKidCzXNTQGI96nnqqxKEDJw0U=; b=XcsscOO/J+Lyb89zJUKEc/5Y4kjDzXvVrs2CtviHUDfX24cxFbKViKXTuNr2+uHFr6RTYR f+Lr+JNLELcxT0oeVFOa9YLdyrtiSJCPbGTmMLSR6T08+JRTeO++99x35RLQj/4mx0mNSv k9rVbmnxC/mCjQ5aUzcEzCV2yLb5KgGCAbB7x5GUAkGoLyi/8eOeuY9hixASpLTxlbFbRz BIRIHGq352vHYxN+zGERltpWoMN3Kz98kTa+qzP73JltvHrZ2beEXYLDeeXTShLn8wspUL ctfBfwe63cCXA818TijryxCLGyO1wzQwo+pVaSof/2AFz4rCan7je2mlqcAiBQ== 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 4X6lWj257Czw5v; Mon, 16 Sep 2024 13:05:21 +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 48GD5Lqt020645; Mon, 16 Sep 2024 13:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48GD5LJg020642; Mon, 16 Sep 2024 13:05:21 GMT (envelope-from git) Date: Mon, 16 Sep 2024 13:05:21 GMT Message-Id: <202409161305.48GD5LJg020642@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: 50ecaf1bd46a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 50ecaf1bd46a834c4fdaf483eb39df7bb62501e3 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=50ecaf1bd46a834c4fdaf483eb39df7bb62501e3 commit 50ecaf1bd46a834c4fdaf483eb39df7bb62501e3 Author: Kristof Provost AuthorDate: 2024-08-28 13:40:42 +0000 Commit: Kristof Provost CommitDate: 2024-09-16 11:46:14 +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 --- 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 cb404b93946e..d675c5381e8a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7648,10 +7648,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 */ }