Module Name:    src
Committed By:   martin
Date:           Fri Aug 20 19:34:49 UTC 2021

Modified Files:
        src/sys/netinet6 [netbsd-8]: nd6.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1692):

        sys/netinet6/nd6.c: revision 1.277

nd6: prevent ln from being freed while releasing held packets


To generate a diff of this commit:
cvs rdiff -u -r1.232.2.13 -r1.232.2.14 src/sys/netinet6/nd6.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.232.2.13 src/sys/netinet6/nd6.c:1.232.2.14
--- src/sys/netinet6/nd6.c:1.232.2.13	Mon Sep 30 15:48:45 2019
+++ src/sys/netinet6/nd6.c	Fri Aug 20 19:34:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.232.2.13 2019/09/30 15:48:45 martin Exp $	*/
+/*	$NetBSD: nd6.c,v 1.232.2.14 2021/08/20 19:34:49 martin Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.13 2019/09/30 15:48:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.14 2021/08/20 19:34:49 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2014,6 +2014,7 @@ nd6_llinfo_release_pkts(struct llentry *
 
 	m_hold = ln->la_hold, ln->la_hold = NULL, ln->la_numheld = 0;
 
+	LLE_ADDREF(ln);
 	LLE_WUNLOCK(ln);
 	for (; m_hold != NULL; m_hold = m_hold_next) {
 		m_hold_next = m_hold->m_nextpkt;
@@ -2027,6 +2028,7 @@ nd6_llinfo_release_pkts(struct llentry *
 		ip6_if_output(ifp, ifp, m_hold, &sin6, NULL);
 	}
 	LLE_WLOCK(ln);
+	LLE_REMREF(ln);
 }
 
 /*

Reply via email to