Module Name: src
Committed By: martin
Date: Fri Mar 15 14:44:05 UTC 2019
Modified Files:
src/sys/net [netbsd-8]: route.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1215):
sys/net/route.c: revision 1.217
Add missing ifa_release on error paths
To generate a diff of this commit:
cvs rdiff -u -r1.194.6.12 -r1.194.6.13 src/sys/net/route.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/net/route.c
diff -u src/sys/net/route.c:1.194.6.12 src/sys/net/route.c:1.194.6.13
--- src/sys/net/route.c:1.194.6.12 Tue Nov 6 14:38:58 2018
+++ src/sys/net/route.c Fri Mar 15 14:44:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.194.6.12 2018/11/06 14:38:58 martin Exp $ */
+/* $NetBSD: route.c,v 1.194.6.13 2019/03/15 14:44:05 martin Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.194.6.12 2018/11/06 14:38:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.194.6.13 2019/03/15 14:44:05 martin Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -1504,6 +1504,8 @@ rt_update(struct rtentry *rt, struct rt_
}
if (new_ifa == NULL)
ifa_release(ifa, &psref_ifa);
+ /* To avoid ifa_release below */
+ ifa = NULL;
}
ifa_release(new_ifa, &psref_new_ifa);
if (new_ifp && rt->rt_ifp != new_ifp && !if_is_deactivated(new_ifp)) {
@@ -1525,6 +1527,7 @@ rt_update(struct rtentry *rt, struct rt_
(void)ifp_changed; /* XXX gcc */
#endif
out:
+ ifa_release(ifa, &psref_ifa);
if_put(new_ifp, &psref_new_ifp);
if_put(ifp, &psref_ifp);
