diff options
author | karels <karels@FreeBSD.org> | 2017-04-10 01:26:12 +0000 |
---|---|---|
committer | Luiz Souza <luiz@netgate.com> | 2017-07-16 14:39:23 -0500 |
commit | cf5a82ffa7ab4ad212af1deb5d5fb5e85bd99a2e (patch) | |
tree | c32c9596407c2aa569f52579ceab96267b090397 | |
parent | 4b827d33b1f6491a2c23cf2e696253505c124dc7 (diff) | |
download | FreeBSD-src-cf5a82ffa7ab4ad212af1deb5d5fb5e85bd99a2e.zip FreeBSD-src-cf5a82ffa7ab4ad212af1deb5d5fb5e85bd99a2e.tar.gz |
Fix reference count leak with L2 caching.
MFC r315956
ip_forward, TCP/IPv6, and probably SCTP leaked references to L2 cache
entry because they used their own routes on the stack, not in_pcb routes.
The original model for route caching was callers that provided a route
structure to ip{,6}input() would keep the route, and this model was used
for L2 caching as well. Instead, change L2 caching to be done by default
only when using a route structure in the in_pcb; the pcb deallocation
code frees L2 as well as L3 cacches. A separate change will add route
caching to TCP/IPv6.
Another suggestion was to have the transport protocols indicate willingness
to use L2 caching, but this approach keeps the changes in the network
level
Reviewed by: ae gnn
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D10059
(cherry picked from commit 0b219504060b9ed97df36d0816488603c7305d64)
-rw-r--r-- | sys/netinet/in_pcb.c | 6 | ||||
-rw-r--r-- | sys/netinet/ip_output.c | 3 | ||||
-rw-r--r-- | sys/netinet6/ip6_output.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 7d5da0e..f69e0a7 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -330,6 +330,12 @@ in_pcballoc(struct socket *so, struct inpcbinfo *pcbinfo) #endif inp->inp_gencnt = ++pcbinfo->ipi_gencnt; refcount_init(&inp->inp_refcount, 1); /* Reference from inpcbinfo */ + + /* + * Routes in inpcb's can cache L2 as well; they are guaranteed + * to be cleaned up. + */ + inp->inp_route.ro_flags = RT_LLE_CACHE; INP_LIST_WUNLOCK(pcbinfo); #if defined(IPSEC) || defined(MAC) out: diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index b5d4951..3c925a8 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -243,8 +243,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags, if (ro == NULL) { ro = &iproute; bzero(ro, sizeof (*ro)); - } else - ro->ro_flags |= RT_LLE_CACHE; + } #ifdef FLOWTABLE if (ro->ro_rt == NULL) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index ec9dc00..6bcfd1a 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -501,8 +501,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, if (ro == NULL) { ro = &ip6route; bzero((caddr_t)ro, sizeof(*ro)); - } else - ro->ro_flags |= RT_LLE_CACHE; + } ro_pmtu = ro; if (opt && opt->ip6po_rthdr) ro = &opt->ip6po_route; |