From nobody Thu Mar 28 19:35:54 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 4V5DKk3mjBz5FrQ0;
Thu, 28 Mar 2024 19:35:54 +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 4V5DKk2vlLz4SNZ;
Thu, 28 Mar 2024 19:35:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1711654554;
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=vHOZJ4IEPnPM/ohsabJMuvFFPAvET9Fp31tw2JiKKqk=;
b=u+cHG/GEuFsL1K/uYk1R2yGIwJsTuSKE2dK37wuMyktnNGHsCF2iuJw6gUBIOm4qbJlohi
mnr5SL9eQQqGaYJJqu0wSZxT9vFRezpWrRG1VTd0jiNLpj9d6Ec//XfU/bhyHP3TFCVzMC
fm+RUY5JcedCkskaFwr5wmPZcQE2ZsFYOu3IaLYDBwWc+5e+C1PNSfniL7RBd106cDIFiJ
FtkLBy3mniRSsnHGjQi5obSbbNzOFQ0AgD+P+CUWKju7UYw8zsMLzYxFysHX7d2Rj9a7uK
3YJ/iP8xDdS/KdEfVMhJbtxHGwRlYQUHlsWhFLTYSPe2IcZKPAnQzObnEWLEHQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711654554; a=rsa-sha256; cv=none;
b=OXpx8hw1cYLMDt0fbUrYYkImOUyhJ52fYnP+NGiqd9d7ASU3u0io76s93Yy08ifo6GNIui
1xMGXUFM0AvNxwDiEU1lwgyNiUIxwp0Xv9pnMcJ6c+C/EY3EOXPfCwhj3xg1ksPOeS4GR5
+cdRJpEL0orEKiJrX89pPcIShKk0hLvc/Trz9CeTgjZi8dA163w46xD7MnVSHivNo4hmmb
25gD3aKw/HSxgYktccqmQxNeHHgYyvxJMGrDjHx02qbtA7JZQNWrdYF+wZT126ZuMfugCE
exbhSz14atdxrIf0Hsn3nFGWNsnA4vdgIoLjtinvsgpu8mWm7WlFotlVUHUudA==
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=1711654554;
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=vHOZJ4IEPnPM/ohsabJMuvFFPAvET9Fp31tw2JiKKqk=;
b=nHvGs7LwyxLPdmKq55M9ITxOlKjSQOnFDoTJvLz8cVBI8+El8FC3bmCbDJmUv44herFw2G
7KOenzsyHGE7ukc7UPAKSTiYcH+L5ixlcfyhBuJaO++NFaqOAW/CfiJ47skbMN0xV4yBkT
2gjhWt4JmBCoThFBHlhOm8rTOjFqhaDD5XQMosQQjD5TbMK01dU/ujS7aH+oDwYKRkcHzB
SCDvN2rZOlHPn/QypQUqf0pTixpEQPZ6KtzFs/IilMYdvjIdMmh350KsIEZkiy3BERw2Sn
SrGDJXPKvJOj6MR44QfTcoFjuRQQVzoKhOsEA/afgMOVK0OxrGfQ8mMUq6KeNQ==
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 4V5DKk2WJjzgmC;
Thu, 28 Mar 2024 19:35:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42SJZseX072259;
Thu, 28 Mar 2024 19:35:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42SJZseC072256;
Thu, 28 Mar 2024 19:35:54 GMT
(envelope-from git)
Date: Thu, 28 Mar 2024 19:35:54 GMT
Message-Id: <202403281935.42SJZseC072256@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Gleb Smirnoff <glebius@FreeBSD.org>
Subject: git: d6e1ae659b11 - stable/14 - carp: check CARP status
in in_localip_fib(), in6_localip_fib()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: glebius
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: d6e1ae659b11a13a9c289424735394173907c1d3
Auto-Submitted: auto-generated
The branch stable/14 has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=d6e1ae659b11a13a9c289424735394173907c1d3
commit d6e1ae659b11a13a9c289424735394173907c1d3
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2024-03-19 18:48:59 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2024-03-28 19:35:45 +0000
carp: check CARP status in in_localip_fib(), in6_localip_fib()
Don't report a BACKUP CARP address as local. These two functions are used
only by source address validation for input packets, controlled by sysctls
net.inet.ip.source_address_validation and
net.inet6.ip6.source_address_validation. For this purpose we definitely
want to treat BACKUP addresses as non local.
This change is conservative and doesn't modify compat in_localip() and
in6_localip(). They are used more widely than the FIB-aware versions.
The change would modify the notion of ipfw(4) 'me' keyword. There might
be other consequences as in_localip() is used by various tunneling
protocols.
PR: 277349
(cherry picked from commit 56f7860087eec14b4a65310b70bd704e79e1b48c)
---
sys/netinet/in.c | 4 +++-
sys/netinet6/in6.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index a23d32cff3dd..4ef1d9735658 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -167,7 +167,7 @@ in_localip(struct in_addr in)
}
/*
- * Like in_localip(), but FIB-aware.
+ * Like in_localip(), but FIB-aware and carp(4)-aware.
*/
bool
in_localip_fib(struct in_addr in, uint16_t fib)
@@ -178,6 +178,8 @@ in_localip_fib(struct in_addr in, uint16_t fib)
CK_LIST_FOREACH(ia, INADDR_HASH(in.s_addr), ia_hash)
if (IA_SIN(ia)->sin_addr.s_addr == in.s_addr &&
+ (ia->ia_ifa.ifa_carp == NULL ||
+ carp_master_p(&ia->ia_ifa)) &&
ia->ia_ifa.ifa_ifp->if_fib == fib)
return (true);
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 88ee0fdd3181..55d675417c41 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1807,7 +1807,7 @@ in6_localip(struct in6_addr *in6)
}
/*
- * Like in6_localip(), but FIB-aware.
+ * Like in6_localip(), but FIB-aware and carp(4)-aware.
*/
bool
in6_localip_fib(struct in6_addr *in6, uint16_t fib)
@@ -1818,6 +1818,8 @@ in6_localip_fib(struct in6_addr *in6, uint16_t fib)
IN6_IFADDR_RLOCK(&in6_ifa_tracker);
CK_LIST_FOREACH(ia, IN6ADDR_HASH(in6), ia6_hash) {
if (IN6_ARE_ADDR_EQUAL(in6, &ia->ia_addr.sin6_addr) &&
+ (ia->ia_ifa.ifa_carp == NULL ||
+ carp_master_p(&ia->ia_ifa)) &&
ia->ia_ifa.ifa_ifp->if_fib == fib) {
IN6_IFADDR_RUNLOCK(&in6_ifa_tracker);
return (true);