Module Name: src
Committed By: nia
Date: Mon Dec 28 20:19:50 UTC 2020
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
Add more guards against NULL deref, since KUBSAN still complains.
To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 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.275 src/sys/netinet6/nd6.c:1.276
--- src/sys/netinet6/nd6.c:1.275 Sat Dec 26 10:43:39 2020
+++ src/sys/netinet6/nd6.c Mon Dec 28 20:19:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.275 2020/12/26 10:43:39 nia Exp $ */
+/* $NetBSD: nd6.c,v 1.276 2020/12/28 20:19:50 nia 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.275 2020/12/26 10:43:39 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.276 2020/12/28 20:19:50 nia Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -384,8 +384,10 @@ nd6_llinfo_output(struct ifnet *ifp, con
const union l3addr *hsrc)
{
- nd6_ns_output(ifp, daddr != NULL ? &daddr->addr6 : NULL,
- &taddr->addr6, &hsrc->addr6, NULL);
+ nd6_ns_output(ifp,
+ daddr != NULL ? &daddr->addr6 : NULL,
+ taddr != NULL ? &taddr->addr6 : NULL,
+ hsrc != NULL ? &hsrc->addr6 : NULL, NULL);
}
static bool
