From nobody Thu Aug 6 15:01:33 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 4hG9Tp3Vy9z6nB7R for ; Thu, 06 Aug 2026 15:01:34 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG9Tn5NB8z3Dkt for ; Thu, 06 Aug 2026 15:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028493; 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=g5c/BEu4XD7WM1A4aq9ACsjqigqLsOA94f84YJwDK8M=; b=jIeUSF4fIJhSeXziuKSo9i3UPABe8BbKnpTPHUDrI33ofoBVkpkEFGnxUA9n4Q+mhr0Mfi gaJvC7D+hSAqHM/rQpJMubfs6rSgmh7c2OALUjP0Jc9GdkTwd5ZS6/0qRf1QTKVqTXybow PSqLA6BIlzrh9aJNy6x3BQrgaFAUgVF+/RPRq92GegJyRGUCDD0V0i1YUqrbzktRn+me2q nbNXRsKOBOesnkwICkDg1dQhDxnoSSVwu+BE6dYbgjlVnwE0XKAaT/Nx4TbI2R5bAnKWoh DJDQd4YrZmXMVcIkibFsPagbvgVJQQZ/w7kVvBLFUD69kCXQaGRtSXqu83LElg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028493; a=rsa-sha256; cv=none; b=TGgBz/s2wiQGtUZeMh8nOovnqnog4G9usmdUXhQ+NATQeWvZRc/xTt9zmodsampBnnSv7F CKTUFOEeTkkt7KUhcV+BZZ1XobszpeGPQuMs0oRYnIkosQdsKWEUk0BMYKAjzuvtIyeVGw BczgaVpWc33+Dr4ej9s10GKc5mLYKWGKqlH8jHtycDYoDWLSeDmOkKR2052J8nWdA2pnt5 c8eDZBonBJPFwgNaAM5h5CtDB9mmDqhmkxYMZHDmuuQGHZLdN/UwKGrU0VcOqLIp0p+aGj O5OTcECKSNi/ET0lqtHvI8mVePgDay9ye+roKAEwgFI8UwS5wJqxMGZqT26VNQ== 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=1786028493; 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=g5c/BEu4XD7WM1A4aq9ACsjqigqLsOA94f84YJwDK8M=; b=MdYhezgYU8ZQeOnHWNCBzc0qam6pUSHFLDWpXMdJvf5qAqve0cBpRA2XCJbPydtCjvPgBM x0EWwbYYS3cOUtcriGC9GWHlKjVWu1xQo0WznQW79Ey49hekHVYtPjRxikCgYTBUlYwD17 e3tg158TgYWf8ZhQ7vDbC7mgC8Vi6JKj5q9c+gh3eBt0GfzPy3grwyaoTH/PpQu/9cf+ht yWNrJJ1eUar5putMEK1hqXgyDnUNOr8hdUNTl/f+YuyWrn0otb/IJfQjrPIH2BO1cmlUQq m0dDjmudpYN7BXR9azCkkwM1zn16s2HbI1IYlg2KFgrSBmyQWPENEQd36DyBIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Tn3pYJz8kZ for ; Thu, 06 Aug 2026 15:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46b1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fd58b2ba0910 - stable/15 - netinet6/nd6: Sprinkle missing prefix refcounting 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 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fd58b2ba0910c2442b91025e3c495ef3289f429d Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:33 +0000 Message-Id: <6a74a1cd.46b1d.637fdbd9@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd58b2ba0910c2442b91025e3c495ef3289f429d commit fd58b2ba0910c2442b91025e3c495ef3289f429d Author: Mark Johnston AuthorDate: 2026-07-24 20:05:06 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 12:52:28 +0000 netinet6/nd6: Sprinkle missing prefix refcounting When we drop the prefix lock to call nd6_prefix_offlink() or nd6_prefix_onlink(), make sure to keep the correpsonding prefix structure alive. It is possible for a concurrent nd6_timer() to expire the prefix while the lock is dropped. Reported by: Maik Muench of Secfault Security Reviewed by: pouria, zlei MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58423 (cherry picked from commit 76ca489e0f147e9bd90408ea562087e84ed6f479) --- sys/netinet6/nd6_rtr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 2556ed101a90..4735685a61cd 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1929,6 +1929,7 @@ restart: flags = pr->ndpr_stateflags & (NDPRF_DETACHED | NDPRF_ONLINK); if (flags == 0 || flags == (NDPRF_DETACHED | NDPRF_ONLINK)) { genid = V_nd6_list_genid; + nd6_prefix_ref(pr); ND6_RUNLOCK(); if ((flags & NDPRF_ONLINK) != 0 && (e = nd6_prefix_offlink(pr)) != 0) { @@ -1947,6 +1948,7 @@ restart: &pr->ndpr_prefix.sin6_addr), pr->ndpr_plen, e)); } + nd6_prefix_rele(pr); ND6_RLOCK(); if (genid != V_nd6_list_genid) goto restart; @@ -2209,6 +2211,7 @@ restart: int e; genid = V_nd6_list_genid; + nd6_prefix_ref(opr); ND6_RUNLOCK(); if ((e = nd6_prefix_onlink(opr)) != 0) { nd6log((LOG_ERR, @@ -2220,6 +2223,7 @@ restart: if_name(opr->ndpr_ifp), e)); } else a_failure = 0; + nd6_prefix_rele(opr); ND6_RLOCK(); if (genid != V_nd6_list_genid) goto restart;