Module Name: src
Committed By: snj
Date: Tue Oct 24 09:00:23 UTC 2017
Modified Files:
src/sys/netinet6 [netbsd-8]: nd6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #307):
sys/netinet6/nd6.c: revision 1.236
Add missing NULL check
PR kern/52554
To generate a diff of this commit:
cvs rdiff -u -r1.232.2.1 -r1.232.2.2 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.1 src/sys/netinet6/nd6.c:1.232.2.2
--- src/sys/netinet6/nd6.c:1.232.2.1 Fri Jul 7 13:57:26 2017
+++ src/sys/netinet6/nd6.c Tue Oct 24 09:00:22 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.232.2.1 2017/07/07 13:57:26 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.232.2.2 2017/10/24 09:00:22 snj 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.1 2017/07/07 13:57:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.232.2.2 2017/10/24 09:00:22 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -2321,6 +2321,11 @@ nd6_resolve(struct ifnet *ifp, const str
created = true;
}
+ if (ln == NULL) {
+ m_freem(m);
+ return ENETDOWN; /* better error? */
+ }
+
LLE_WLOCK_ASSERT(ln);
/* We don't have to do link-layer address resolution on a p2p link. */
