Module Name: src
Committed By: martin
Date: Sun Sep 1 14:06:22 UTC 2019
Modified Files:
src/sys/netinet6 [netbsd-9]: nd6.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #148):
sys/netinet6/nd6.c: revision 1.261
inet6: don't set an invalid lladdr in nd6_free()
We don't want to announce that we've deleted a hwaddr of all zeros.
To generate a diff of this commit:
cvs rdiff -u -r1.256.2.3 -r1.256.2.4 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.256.2.3 src/sys/netinet6/nd6.c:1.256.2.4
--- src/sys/netinet6/nd6.c:1.256.2.3 Sun Sep 1 11:00:31 2019
+++ src/sys/netinet6/nd6.c Sun Sep 1 14:06:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.256.2.3 2019/09/01 11:00:31 martin Exp $ */
+/* $NetBSD: nd6.c,v 1.256.2.4 2019/09/01 14:06:22 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.256.2.3 2019/09/01 11:00:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.256.2.4 2019/09/01 14:06:22 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1192,6 +1192,7 @@ nd6_free(struct llentry *ln, int gc)
struct ifnet *ifp;
struct in6_addr *in6;
struct sockaddr_in6 sin6;
+ const char *lladdr;
KASSERT(ln != NULL);
LLE_WLOCK_ASSERT(ln);
@@ -1282,8 +1283,8 @@ nd6_free(struct llentry *ln, int gc)
}
sockaddr_in6_init(&sin6, in6, 0, 0, 0);
- rt_clonedmsg(RTM_DELETE, sin6tosa(&sin6),
- (const uint8_t *)&ln->ll_addr, ifp);
+ lladdr = ln->la_flags & LLE_VALID ? (const char *)&ln->ll_addr : NULL;
+ rt_clonedmsg(RTM_DELETE, sin6tosa(&sin6), lladdr, ifp);
/*
* Save to unlock. We still hold an extra reference and will not
