From nobody Wed Oct 15 14:05:59 2025 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 4cmtCq4kLwz6CRWn; Wed, 15 Oct 2025 14:05:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cmtCq3w7Kz3WPk; Wed, 15 Oct 2025 14:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760537159; 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=/3GQZ68a9rDum6qXft0lsbNF6CdHxBtnNXyajjAfuwk=; b=g/0Hj7iBlH3N30dA0UAgfBjsspW7QHRGF9ysRAPUnTbDUoZCGfLtHGr1VilzMDbXGsAl+y BDRQoGlJBbgvFas177pNcxbebCJYt4+VaGqn+HXeJwRWar9w/EItZ9Pc+qYXK/G19ASlv0 RMwFH6pWBRByhTCGEwVKR2VnjMw7Sie+g+KDm2k8DnaOsyXe7M7z27OoeCeSRmL1i9dqav CyaO1N+1M548Vj/KPZculTIPxSZw4oBsqpCQDGazs7MR/IJ1TrGeCDYh2HyAG2MYkPqL8x xHZV9BN6Joxfr0MA44kmxul46zoYL6jXvAid8PQnE9BY0c6pSj2nqa9l4z2+rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760537159; 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=/3GQZ68a9rDum6qXft0lsbNF6CdHxBtnNXyajjAfuwk=; b=ICrwWvTZm4geT1OhXbwhmyTvAu5CqT/bvEhs0njFo39zZT2NCpPj9z3NnZxwudy51NryiJ iDfwgnAxzMIvvrBH14AzO3Iv6RDxzdJ2qqNDQeyDoF/GBZA4qRFBiPdTGyQ7FcyaXeeW0b BwmvIhYZDFxTqWJuRZcmbw6div9RN2Sksi75vi8pAo8gNskY5WE3pbmBn1ZVRSKakbewU1 lidO1QpCfnMhKxerOtp6G4Urv9KbXaG5uO5NCFYjjmA35kuIfXWcqqqpUv5soLsrkcbg14 1Br2U7qX2QY9oOoJbfyyRW0ar0I+pXDZFw+AR0D67DsPjPf6uiCNZr54VXahIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760537159; a=rsa-sha256; cv=none; b=bzCMfuRkQNto9e/X5R+joRxbuXTgm48o1GnX09Ka0oA0Q+PJy0ZTgRu5V0qsMpUbEJVO6u lCzN6CETscnOnc98mHGA3Ih5jg2LI5JTzNQ4hXvoNdxkIWz1He+xqC03dkMdU7bU8ld0AN nAdToQdvbn3adgHvekeqeLrO1ZzchHs1sqsMofB+XCb6uOaPceblY1dGocltlxbQhiKGYc 8aYV/43bhA/jUSa8hex+ZByr8BVlG5jWWK34V3W2oafiWAKz0t4TbIXLm+jihMfAxEROf2 XQP3Vn0NV5PU7P89I3meoTjUBwUGdYJ6dfemianFbpeeLKcfvmf+yYkN1/gKGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cmtCq31HTzhsJ; Wed, 15 Oct 2025 14:05:59 +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 59FE5xBv026976; Wed, 15 Oct 2025 14:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FE5xup026973; Wed, 15 Oct 2025 14:05:59 GMT (envelope-from git) Date: Wed, 15 Oct 2025 14:05:59 GMT Message-Id: <202510151405.59FE5xup026973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 25c6697b0b98 - stable/15 - ipv6: don't complain when deleting an address with prefix length of 128 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 25c6697b0b985228639cdeb5212a5f705731f69a Auto-Submitted: auto-generated The branch stable/15 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=25c6697b0b985228639cdeb5212a5f705731f69a commit 25c6697b0b985228639cdeb5212a5f705731f69a Author: Andrey V. Elsukov AuthorDate: 2025-10-07 13:08:15 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-10-15 14:05:07 +0000 ipv6: don't complain when deleting an address with prefix length of 128 Save prefix length in unused field in6_ifaddr->ia_plen, then on remove check if an address has 128 prefix length, and if so, we don't need to complain that there is none of related prefixes. Reviewed by: kp Obtained from: Yandex LLC Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D52952 (cherry picked from commit c4cce0a3e94e3b22f874508d1a9cd81442648238) --- sys/netinet6/in6.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4f756a75fac7..b98703bdfbfe 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1295,8 +1295,8 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i */ bzero(&pr0, sizeof(pr0)); pr0.ndpr_ifp = ifp; - pr0.ndpr_plen = in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, - NULL); + pr0.ndpr_plen = ia->ia_plen = + in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, NULL); if (pr0.ndpr_plen == 128) { /* we don't need to install a host route. */ goto aifaddr_out; @@ -1490,16 +1490,16 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) * positive reference. */ remove_lle = 0; - if (ia->ia6_ndpr == NULL) { - nd6log((LOG_NOTICE, - "in6_unlink_ifa: autoconf'ed address " - "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); - } else { + if (ia->ia6_ndpr != NULL) { ia->ia6_ndpr->ndpr_addrcnt--; /* Do not delete lles within prefix if refcont != 0 */ if (ia->ia6_ndpr->ndpr_addrcnt == 0) remove_lle = 1; ia->ia6_ndpr = NULL; + } else if (ia->ia_plen < 128) { + nd6log((LOG_NOTICE, + "in6_unlink_ifa: autoconf'ed address " + "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); } nd6_rem_ifa_lle(ia, remove_lle);