From nobody Fri Jul 24 21:07:22 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 4h6LCt5V1wz6mkfb for ; Fri, 24 Jul 2026 21:07:22 +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 4h6LCt3tGwz3cQx for ; Fri, 24 Jul 2026 21:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784927242; 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=j/sIpipXeJJfYTLJ69sDupQoswtgqKTIfOtj0iraywE=; b=POxtfzz6dl2zYliAb1Qt2TqLUWjibq7OBXSqN0L6AXOEnv+1vTNuvG2AVptDLwX5LKrXXQ DisaRoMQQJA9Sgz3Hf2jwda3NUhv9UBU2LsqweYL3INKk5ekjOm551kFCWtmHAWijBLvsr RWsXvORSoirfMrKRQ6TFLL3z3iVkQkJ4Ae8axhwkEe1AWrVlEcOVF0bvx4ASsO9ZZt5rGf VBdP8oALQ2+TYq5cdNkeLdKXmgtXJ8WCslTx5tA/y/ujTkT383uKXgLmwRQLCNQhTF8gVv NS/sx7zvbiFWsitqCkT7rhEPuCUn0YJKpzPVsjif9QWQRcWKMF555bFzx/VOLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784927242; a=rsa-sha256; cv=none; b=qQFMjVvN9aPgYweFFihM2oXJTo3z/5mCLAnMYDs0lnSVAbOQYBJt0HvtNcehlWczh4hZDT gRUiKddRCMNgyUqYlF6U50hAYxelh59K92nsw2bPF4HA+RYNEJf7iEABNMN14YCD07+eSl pnbk0Q414h3NfBsVr6HEU2zwhV6u4MkJD4UHYxEZxTWkhTpUrwLkdXhFjMwfIrAmOFQ/lF lMmSTOqh+LYdmXRAZgbkT8O1CejqeMlmi5PVvymoIVWvaqi6Dxle0PL7NAwa7hZ/JxtlQQ tU8JBnBrX5qDRnVNgsr+010CFUnNX42rb1uTJ/iS4IgwcxaY3WPO1Xv9CTL38Q== 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=1784927242; 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=j/sIpipXeJJfYTLJ69sDupQoswtgqKTIfOtj0iraywE=; b=EFZq0SRzJncboMsID2q3XdOcha/ORoRfjZ6kHcgCKEz6KLAY+aHiDj1Q8/N4POYOp8yyE7 U1+DF9oRBkHiqLqXPqsjblFaCYKRavC6SHlp+gEgZI+/dXWEsKX6qEwet6th6ObUBsie+W a8xkeRlTOWcY44UnHECQZdtMciIukhDCYeGSw1QNBVwfJ+/FrOz5S5ZOQ1I7+/NYpf6mLb 1CpijCBzVw+sq6Kkht9h5gA1ZRaBEfKfdYkWGwKT0cWJuykMHSudChPQC1zpwo3KwL0YX0 rYuzcXkkDpPkkypM3VahNq41p/DnPyVY3fXsZz4nwtCnGtpId811s4UFZ1qAEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6LCt20XTz179q for ; Fri, 24 Jul 2026 21:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 381b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Jul 2026 21:07:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 76ca489e0f14 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 76ca489e0f147e9bd90408ea562087e84ed6f479 Auto-Submitted: auto-generated Date: Fri, 24 Jul 2026 21:07:22 +0000 Message-Id: <6a63d40a.381b9.235dfcc5@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=76ca489e0f147e9bd90408ea562087e84ed6f479 commit 76ca489e0f147e9bd90408ea562087e84ed6f479 Author: Mark Johnston AuthorDate: 2026-07-24 20:05:06 +0000 Commit: Mark Johnston CommitDate: 2026-07-24 20:05:06 +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 --- 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 167f3704f02d..041fd25865ab 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1940,6 +1940,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) { @@ -1958,6 +1959,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; @@ -2220,6 +2222,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, @@ -2231,6 +2234,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;