From nobody Thu Feb 5 18:37:00 2026 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 4f6QtP0K54z6R2Df for ; Thu, 05 Feb 2026 18:37:01 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6QtN5Nzdz4CRy for ; Thu, 05 Feb 2026 18:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770316620; 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=ubVG3ehRFcfw+gzQ9GH+6VBEjiMDDb8x0IJwWQqiLjM=; b=q4l8YrWm9ZFcFhZvoN466WfdFYXgtvosVc0zvAXwSu+eLQwbi/7Yw3i83LD4Jrk6IVLUor weKJxYOCn48LQK0qC/O7cR0NrWDn2dXG9+B4fdAev8OoG0uGoCKg+JjtAe+V84V7wI9RCD VMeyImYHuVm6d8xI+7LRnpvms1G9/audI5m91PN0YIJaUeeNPMIDRGl2xwA0iUKAispBaa 0jkGluvWviWU7KQ7VtEuNgdBP5Zx30cVlLbSoWMgeYCfEyQJ/Rt5hJEi12UYVC7p2ievqP KgKGQ7Pf0dAkTwSKzImwNzkCkcBBwQuOooNC+Y5+g9IJ5xryjGsJBsEzP8NXiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770316620; a=rsa-sha256; cv=none; b=b1dBXcpDuq3Yx80rZycGn4R7/Pr3EmeorQrC1YtUNMTgy/9m5mqgpYPXFgpmQlBScgcG/q vX8rjSxFaLSWLNeiSMuN6ALCQZ7pYAyXfsZx/YAnv0mRTFeEJSJLO1aar+NCSVq9Mdg8XU zmgftmMlpXDOsxPJy5jQ77yhQKcn5Ejv9g5NfzGu3M4dxpDGvWKEr7ONxb/KaCwpx6fDlh l93LV/AaO1H4pp7O3ZtooDmSs5iIbgrc7OfK/no2M269QaUJxGOsIg+kC8CvEOSuDIQeTN jd9gmZON9zS9Q+9PFqsM/XjiRpdP5ilzI/bJ5J7tX81KgaMQz2mfcWfTlETlPg== 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=1770316620; 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=ubVG3ehRFcfw+gzQ9GH+6VBEjiMDDb8x0IJwWQqiLjM=; b=aAweuz8TRyteLbBp18Zkam18/u3ssx9Lrv1/iarZvrPI++EA1am83VxWxgwsZHsLXweXtK vLsabBXrmbXfeHPQz1vnU80olBmkm84Mn7ivlcUZVNi68hUUKa1nKI1zPNqrWDLhJ2SJBm REYXcMGXp4sJM7b6TUCJ2MqFVfO9MSwQrqzyaq7YA+nFGQ6eCnaZ9WHbPfoaZGLMtWjeLa mtc5fE2XWEOY7zh7x0PX8DoyDBZ9fHzX+rxSAiotc17Vcc/wVa3rZzfAzWYBwSayVfW0sT Kzjygs/6x+TsedXfxLHESsagEMRjGov8LGlRIDlbEH27U9YOAgoBpktyXC94mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6QtN4y1lzhYk for ; Thu, 05 Feb 2026 18:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33eba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 18:37:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b0037260b73f - stable/14 - in6: Modify address prefix lifetimes when updating address lifetimes 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0037260b73f405d7ae5140f50cd279c0a9a30cd Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 18:37:00 +0000 Message-Id: <6984e34c.33eba.506f8082@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0037260b73f405d7ae5140f50cd279c0a9a30cd commit b0037260b73f405d7ae5140f50cd279c0a9a30cd Author: Mark Johnston AuthorDate: 2026-01-12 13:49:54 +0000 Commit: Mark Johnston CommitDate: 2026-02-05 18:36:43 +0000 in6: Modify address prefix lifetimes when updating address lifetimes When one uses SIOCAIFADDR_IN6 to add a v6 address, it's possible to set the preferred and valid lifetimes of the address. If the address already exists, this ioctl will recalculate and update the expiry times based on the provided timestamps. When adding a new address, the lifetimes are inherited by the prefix as well, but only if we create a new prefix. If the prefix already exists, as it will in the case where an address is being updated rather than being added, we do not touch the prefix lifetimes at all. This means that the original address lifetime still applies to the route associated with that prefix, so when the prefix expires, the route goes away. This behaviour doesn't make a lot of sense: if the admin updates an address lifetime, we should ensure that the prefix lifetime is updated too. Make that change, ensuring that we do not shorten the prefix lifetime, as the prefix might be shared among multiple interface addresses. Add a regression test. Co-authored by: Franco Fichtner Reviewed by: pouria, zlei, ae MFC after: 2 weeks Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54562 (cherry picked from commit 74999aac5effb9b32d12f413ef51e87b15c8a0d8) --- sys/netinet6/in6.c | 22 ++++++++++++++ tests/sys/netinet6/ndp.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 86e59283f9b1..fb661ade438d 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1326,6 +1326,28 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i (*carp_detach_p)(&ia->ia_ifa, false); goto out; } + } else if (pr->ndpr_raf_onlink) { + time_t expiry; + + /* + * If the prefix already exists, update lifetimes, but avoid + * shortening them. + */ + ND6_WLOCK(); + expiry = in6_expire_time(pr0.ndpr_pltime); + if (pr->ndpr_preferred != 0 && + (pr->ndpr_preferred < expiry || expiry == 0)) { + pr->ndpr_pltime = pr0.ndpr_pltime; + pr->ndpr_preferred = expiry; + } + expiry = in6_expire_time(pr0.ndpr_vltime); + if (pr->ndpr_expire != 0 && + (pr->ndpr_expire < expiry || expiry == 0)) { + pr->ndpr_vltime = pr0.ndpr_vltime; + pr->ndpr_expire = expiry; + } + pr->ndpr_lastupdate = time_uptime; + ND6_WUNLOCK(); } /* relate the address to the prefix */ diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 10c101c09a19..03fab97fed43 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -249,10 +249,86 @@ ndp_prefix_lifetime_cleanup() { vnet_cleanup } +atf_test_case "ndp_prefix_lifetime_extend" +ndp_prefix_lifetime_extend_head() { + atf_set descr 'Test prefix lifetime updates via ifconfig' + atf_set require.user root + atf_set require.progs jq +} + +get_prefix_attr() { + local prefix=$1 + local attr=$2 + + ndp -p --libxo json | \ + jq -r '.ndp.["prefix-list"][] | + select(.prefix == "'${prefix}'") | .["'${attr}'"]' +} + +# Given a prefix, return its expiry time in seconds. +prefix_expiry() { + get_prefix_attr $1 "expires_sec" +} + +# Given a prefix, return its valid and preferred lifetimes. +prefix_lifetimes() { + local p v + + v=$(get_prefix_attr $1 "valid-lifetime") + p=$(get_prefix_attr $1 "preferred-lifetime") + echo $v $p +} + +ndp_prefix_lifetime_extend_body() { + local epair ex1 ex2 ex3 prefix pltime vltime + + atf_check -o save:epair ifconfig epair create + epair=$(cat epair) + atf_check ifconfig ${epair} up + + prefix="2001:db8:ffff:1000::" + + atf_check ifconfig ${epair} inet6 ${prefix}1/64 pltime 5 vltime 10 + t=$(prefix_lifetimes ${prefix}/64) + if [ "${t}" != "10 5" ]; then + atf_fail "Unexpected lifetimes: ${t}" + fi + ex1=$(prefix_expiry ${prefix}/64) + if [ "${ex1}" -gt 10 ]; then + atf_fail "Unexpected expiry time: ${ex1}" + fi + + # Double the address lifetime and verify that the prefix is + # updated. + atf_check ifconfig ${epair} inet6 ${prefix}1/64 pltime 10 vltime 20 + t=$(prefix_lifetimes ${prefix}/64) + if [ "${t}" != "20 10" ]; then + atf_fail "Unexpected lifetimes: ${t}" + fi + ex2=$(prefix_expiry ${prefix}/64) + if [ "${ex2}" -le "${ex1}" ]; then + atf_fail "Expiry time was not extended: ${ex1} <= ${ex2}" + fi + + # Add a second address from the same prefix with a shorter + # lifetime, and make sure that the prefix lifetime is not + # shortened. + atf_check ifconfig ${epair} inet6 ${prefix}2/64 pltime 5 vltime 10 + t=$(prefix_lifetimes ${prefix}/64) + if [ "${t}" != "20 10" ]; then + atf_fail "Unexpected lifetimes: ${t}" + fi + ex3=$(prefix_expiry ${prefix}/64) + if [ "${ex3}" -lt "${ex2}" ]; then + atf_fail "Expiry time was shortened: ${ex2} <= ${ex3}" + fi +} + atf_init_test_cases() { atf_add_test_case "ndp_add_gu_success" atf_add_test_case "ndp_del_gu_success" atf_add_test_case "ndp_slaac_default_route" atf_add_test_case "ndp_prefix_lifetime" + atf_add_test_case "ndp_prefix_lifetime_extend" }