Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Fix double rtfree



details:   https://anonhg.NetBSD.org/src/rev/beb33730f1e0
branches:  trunk
changeset: 339804:beb33730f1e0
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Tue Aug 11 09:30:32 2015 +0000

description:
Fix double rtfree

diffstat:

 sys/netinet6/nd6.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r a0bc3216c740 -r beb33730f1e0 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Tue Aug 11 08:27:08 2015 +0000
+++ b/sys/netinet6/nd6.c        Tue Aug 11 09:30:32 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nd6.c,v 1.167 2015/08/11 08:27:08 ozaki-r Exp $        */
+/*     $NetBSD: nd6.c,v 1.168 2015/08/11 09:30:32 ozaki-r 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.167 2015/08/11 08:27:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.168 2015/08/11 09:30:32 ozaki-r Exp $");
 
 #include "opt_net_mpsafe.h"
 
@@ -2248,9 +2248,6 @@
                 * it is tolerable, because this should be a rare case.
                 */
                if (nd6_is_addr_neighbor(dst, ifp)) {
-                       if (rt != NULL && rt != rt00)
-                               rtfree(rt);
-
                        RTFREE_IF_NEEDED(rt);
                        rt = nd6_lookup(&dst->sin6_addr, 1, ifp);
                        if (rt != NULL)



Home | Main Index | Thread Index | Old Index