Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In gre_clone_destroy(), free the route cache after calling if_detach(), 

because if_detach() may cause us to transmit a packet, which
ordinarily entails reloading the route cache.  This fixes a bug
where the kernel would panic later in rtflush().  Thanks Michael
Earnhart for reporting the bug.

In gre_output(), do not leak mbufs.
This commit is contained in:
dyoung 2007-04-14 22:41:42 +00:00
parent ff3453caa3
commit 3ce5c94b0e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net/if_gre.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.c,v 1.90 2007/03/21 03:18:08 dyoung Exp $ */
/* $NetBSD: if_gre.c,v 1.91 2007/04/14 22:41:42 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.90 2007/03/21 03:18:08 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.91 2007/04/14 22:41:42 dyoung Exp $");
#include "opt_gre.h"
#include "opt_inet.h"
@ -221,8 +221,8 @@ gre_clone_destroy(struct ifnet *ifp)
splx(s);
gre_join(&sc->sc_thread);
s = splnet();
rtcache_free(&sc->route);
if_detach(ifp);
rtcache_free(&sc->route);
splx(s);
if (sc->sc_fp != NULL) {
closef(sc->sc_fp, curlwp);
@ -782,11 +782,14 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
rtcache_init(&sc->route);
else
rtcache_check(&sc->route);
if (sc->route.ro_rt == NULL)
if (sc->route.ro_rt == NULL) {
m_freem(m);
goto end;
if (sc->route.ro_rt->rt_ifp->if_softc == sc)
}
if (sc->route.ro_rt->rt_ifp->if_softc == sc) {
rtcache_free(&sc->route);
else
m_freem(m);
} else
error = ip_output(m, NULL, &sc->route, 0,
(struct ip_moptions *)NULL, (struct socket *)NULL);
end: