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

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

details:   https://anonhg.NetBSD.org/src/rev/e029cb355bcd
branches:  netbsd-6-1
changeset: 775826:e029cb355bcd
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Aug 08 21:57:40 2013 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #926):
        sys/netinet6/nd6_rtr.c: revision 1.86
PR/47576: Takahiro HAYASHI: Avoid crash destroying tap0 after deleting
it's link-local address.

diffstat:

 sys/netinet6/nd6_rtr.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 034109aa281c -r e029cb355bcd sys/netinet6/nd6_rtr.c
--- a/sys/netinet6/nd6_rtr.c    Thu Aug 08 03:20:17 2013 +0000
+++ b/sys/netinet6/nd6_rtr.c    Thu Aug 08 21:57:40 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6_rtr.c,v 1.82.10.2 2013/07/12 11:18:57 jdc Exp $    */
+/*     $NetBSD: nd6_rtr.c,v 1.82.10.3 2013/08/08 21:57:40 snj Exp $    */
 /*     $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $        */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.10.2 2013/07/12 11:18:57 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.82.10.3 2013/08/08 21:57:40 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1038,10 +1038,12 @@
                free(pfr, M_IP6NDP);
        }
 
-       ext->nprefixes--;
-       if (ext->nprefixes < 0) {
-               log(LOG_WARNING, "prelist_remove: negative count on %s\n",
-                   pr->ndpr_ifp->if_xname);
+       if (ext) {
+               ext->nprefixes--;
+               if (ext->nprefixes < 0) {
+                       log(LOG_WARNING, "prelist_remove: negative count on "
+                           "%s\n", pr->ndpr_ifp->if_xname);
+               }
        }
        splx(s);