Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 06 Aug 2026 15:01:33 +0000
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: fd58b2ba0910 - stable/15 - netinet6/nd6: Sprinkle missing prefix refcounting
Message-ID:  <6a74a1cd.46b1d.637fdbd9@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=fd58b2ba0910c2442b91025e3c495ef3289f429d

commit fd58b2ba0910c2442b91025e3c495ef3289f429d
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-07-24 20:05:06 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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;
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a74a1cd.46b1d.637fdbd9>