[src/netbsd-7-1]: src/sys/netinet6 Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/96f33dab7809
branches:  netbsd-7-1
changeset: 800844:96f33dab7809
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 02 13:04:53 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1562):
        sys/netinet6/nd6_nbr.c: revision 1.145 (patch)

Fix memory leak. Contrary to what the XXX indicates, this place is 100%
reachable remotely.

diffstat:

 sys/netinet6/nd6_nbr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 0012caa3cbde -r 96f33dab7809 sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Fri Feb 02 11:02:29 2018 +0000
+++ b/sys/netinet6/nd6_nbr.c    Fri Feb 02 13:04:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6_nbr.c,v 1.100.2.2 2015/04/06 01:32:33 snj Exp $    */
+/*     $NetBSD: nd6_nbr.c,v 1.100.2.2.6.1 2018/02/02 13:04:53 martin Exp $     */
 /*     $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $        */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.100.2.2 2015/04/06 01:32:33 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.100.2.2.6.1 2018/02/02 13:04:53 martin Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -590,7 +590,7 @@
 
        taddr6 = nd_na->nd_na_target;
        if (in6_setscope(&taddr6, ifp, NULL))
-               return;         /* XXX: impossible */
+               goto bad;
 
        if (IN6_IS_ADDR_MULTICAST(&taddr6)) {
                nd6log((LOG_ERR,