From nobody Thu Oct 01 11:05:02 2026 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 4hwTb30d8Nz6tY35 for ; Thu, 01 Oct 2026 11:05:03 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwTb26nQHz4yqv for ; Thu, 01 Oct 2026 11:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790852703; 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=pPnjglq30CC+W6/4SrSowuQ5Cd0TdZawT0eW0hF3URo=; b=DEmTC+mLKjRjxq0PpwWphNt+l6x+foMhPvfEqjH/rlt5xyNDDik6IYV6Tz6XOHHepoWlrL K2EToQU7EWXHcgfzy+HqDDJMJ4yltBB/UV3mUTabeGGVC8nWuXH9hjnUd42UUzGUD6BzZV Iggu6I6EHsmH8aX7Sku0xVfn9Ag0d2xMqit6dWmqvxE5wv7aMy1zCDlCi7lyYvN8G2ezK5 eDI6Jcp2ajEBmM1KeACQFuQ/V6b/kqVle+GuaxC2+BQ9qHr/5nlvWIg3TsaCBd/wz2FMlF StexueU7BD6iPEoZHxElkNsEVMLHdjAKaIQZTbrd8zWyHbKtl0/GZmCfL4avRw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790852703; b=fULuMsZ7YBpNXB4pSCG3ysGjdQvCsn5dfJomadBmVbkDGFaX/NcCwdaJKxFXQS+YGq/0+C 9enKs/zWBChmkru75+5BqQPIceQH6FXJfDqlSBM+3tbre0FAx3YErJ4sxp247cD0EwN0qN SrwvDE742u5gRAgq6HjDdL9OAz+r3Tm8yP4c2IdGV/pQg3YlSEm1zyZgH6pey1Eue1FxjQ xJ0niY+CcFP7gJ3xYhaCkYmoP0WErcTCNwNgQrjpHlApGh3S/BYV+8jOizE0EcyOKbSY0L nu8X07vYLghrYbwMOpoZheZJm4NWli5/cSUstDPaVgFXwem/TfNu3jujRpsMYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790852703; 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=pPnjglq30CC+W6/4SrSowuQ5Cd0TdZawT0eW0hF3URo=; b=HczWE9Stpwse3sJCNf2DyZkYt2AbwrztMQfTZB7PE2IxS35p/rfHSBazj5zcL2dDyWLTFf mjbK1E/eV0X5OJ6nX/eu9TV8ZCLhn+R9RWRLw+nbNnaQ83seC+t/svIDgZi+PRYwfS9Lh1 EDTx1mtw+l1EYnPhNayKJbqXXdyXQTN3CEDNTAg+5MPZn+VMmAbCsE72Lt/9dceSZsnGWT yXozZs8QCS1Gs+btuCyVL9HwmnRNRDyr7HWWMZrqdpNT0zOpbHeDhDivj43u+9xEmQF1Qk MRhQbeQdEAwsGK55jiyVciFpIFztqDX25M97olex91olbW73tD8cxTNhFZsMWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwTb25YpLzSSx for ; Thu, 01 Oct 2026 11:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f820 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 11:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: b69c0082426d - stable/15 - nd6: Fix regeneration of temp addresses in detached state 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b69c0082426dc23553bff7dfc90b41e8a03cf6c8 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 11:05:02 +0000 Message-Id: <6abe3e5e.3f820.33ceae18@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=b69c0082426dc23553bff7dfc90b41e8a03cf6c8 commit b69c0082426dc23553bff7dfc90b41e8a03cf6c8 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-09-26 19:54:16 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-10-01 10:59:30 +0000 nd6: Fix regeneration of temp addresses in detached state When an on-link prefix becomes detached, the kernel keeps generating new RFC 8981 temporary addresses for that prefix. Fix it by ignoring the detached addresses in regen_tmpaddr(). While here, change its return type to bool. PR: 298533 Discussed with: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D60051 (cherry picked from commit 61f98a98250da7bd2c80c6d93d0032961d7f2fad) --- sys/netinet6/nd6.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 00df5efcef92..07527fabe341 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -153,7 +153,7 @@ static bool nd6_is_new_addr_neighbor(const struct sockaddr_in6 *, struct ifnet *); static void nd6_setmtu0(struct ifnet *, struct nd_ifinfo *); static void nd6_slowtimo(void *); -static int regen_tmpaddr(struct in6_ifaddr *); +static bool regen_tmpaddr(struct in6_ifaddr *); static void nd6_free(struct llentry **, int); static void nd6_free_redirect(const struct llentry *); static void nd6_llinfo_timer(void *); @@ -959,7 +959,7 @@ nd6_timer(void *arg) CK_STAILQ_FOREACH_SAFE(ia6, &V_in6_ifaddrhead, ia_link, nia6) { /* check address lifetime */ if (IFA6_IS_INVALID(ia6)) { - int regen = 0; + bool regen = false; /* * If the expiring address is temporary, try @@ -973,8 +973,8 @@ nd6_timer(void *arg) */ if (V_ip6_use_tempaddr && (ia6->ia6_flags & IN6_IFF_TEMPORARY) != 0) { - if (regen_tmpaddr(ia6) == 0) - regen = 1; + if (regen_tmpaddr(ia6)) + regen = true; } in6_purgeaddr(&ia6->ia_ifa); @@ -993,7 +993,7 @@ nd6_timer(void *arg) if (V_ip6_use_tempaddr && (ia6->ia6_flags & IN6_IFF_TEMPORARY) != 0 && (oldflags & IN6_IFF_DEPRECATED) == 0) { - if (regen_tmpaddr(ia6) == 0) { + if (regen_tmpaddr(ia6)) { /* * A new temporary address is * generated. @@ -1094,7 +1094,7 @@ restart: /* * ia6 - deprecated/invalidated temporary address */ -static int +static bool regen_tmpaddr(struct in6_ifaddr *ia6) { struct ifaddr *ifa; @@ -1103,6 +1103,11 @@ regen_tmpaddr(struct in6_ifaddr *ia6) NET_EPOCH_ASSERT(); + /* ignore detached prefixes */ + if (ia6->ia6_ndpr == NULL || + (ia6->ia6_ndpr->ndpr_stateflags & NDPRF_DETACHED) != 0) + return (false); + ifp = ia6->ia_ifa.ifa_ifp; CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct in6_ifaddr *it6; @@ -1112,12 +1117,13 @@ regen_tmpaddr(struct in6_ifaddr *ia6) it6 = (struct in6_ifaddr *)ifa; - /* ignore no autoconf addresses. */ - if ((it6->ia6_flags & IN6_IFF_AUTOCONF) == 0) + /* ignore detached or no autoconf addresses. */ + if ((it6->ia6_flags & + (IN6_IFF_AUTOCONF | IN6_IFF_DETACHED)) != IN6_IFF_AUTOCONF) continue; /* ignore autoconf addresses with different prefixes. */ - if (it6->ia6_ndpr == NULL || it6->ia6_ndpr != ia6->ia6_ndpr) + if (it6->ia6_ndpr != ia6->ia6_ndpr) continue; /* @@ -1152,13 +1158,13 @@ regen_tmpaddr(struct in6_ifaddr *ia6) ifa_free(&public_ifa6->ia_ifa); log(LOG_NOTICE, "regen_tmpaddr: failed to create a new" " tmp addr,errno=%d\n", e); - return (-1); + return (false); } ifa_free(&public_ifa6->ia_ifa); - return (0); + return (true); } - return (-1); + return (false); } /*