[src/netbsd-8]: src/sys/netinet6 Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/fab4b0b50380
branches:  netbsd-8
changeset: 434589:fab4b0b50380
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 02 12:55:08 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #531):
        sys/netinet6/nd6_nbr.c: revision 1.145
Fix memory leak. Contrary to what the XXX indicates, this place is 100%
reachable remotely.

diffstat:

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

diffs (28 lines):

diff -r 4b98c32c0c1e -r fab4b0b50380 sys/netinet6/nd6_nbr.c
--- a/sys/netinet6/nd6_nbr.c    Fri Feb 02 10:55:10 2018 +0000
+++ b/sys/netinet6/nd6_nbr.c    Fri Feb 02 12:55:08 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6_nbr.c,v 1.138.6.2 2018/01/26 15:41:12 martin Exp $ */
+/*     $NetBSD: nd6_nbr.c,v 1.138.6.3 2018/02/02 12:55:08 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.138.6.2 2018/01/26 15:41:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.138.6.3 2018/02/02 12:55:08 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -607,8 +607,7 @@
 
        taddr6 = nd_na->nd_na_target;
        if (in6_setscope(&taddr6, ifp, NULL)) {
-               m_put_rcvif_psref(ifp, &psref);
-               return;         /* XXX: impossible */
+               goto bad;
        }
 
        if (IN6_IS_ADDR_MULTICAST(&taddr6)) {