diff options
author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2010-10-23 20:35:40 +0000 |
---|---|---|
committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2010-10-23 20:35:40 +0000 |
commit | 4a85b5e2eaaed628f6d19891764df6a5a70005f1 (patch) | |
tree | f5d45570646bf96cfcb9125ee6a33290a6a158e2 /sys/netipsec | |
parent | a959b1f02cfdbb7e7388aaf5dfed8d53507de186 (diff) | |
download | src-4a85b5e2eaaed628f6d19891764df6a5a70005f1.tar.gz src-4a85b5e2eaaed628f6d19891764df6a5a70005f1.zip |
Make the IPsec SADB embedded route cache a union to be able to hold both the
legacy and IPv6 route destination address.
Previously in case of IPv6, there was a memory overwrite due to not enough
space for the IPv6 address.
PR: kern/122565
MFC After: 2 weeks
Notes
Notes:
svn path=/head/; revision=214250
Diffstat (limited to 'sys/netipsec')
-rw-r--r-- | sys/netipsec/ipsec_output.c | 3 | ||||
-rw-r--r-- | sys/netipsec/key.c | 8 | ||||
-rw-r--r-- | sys/netipsec/keydb.h | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 2701796f8c06..0907f4575518 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -829,7 +829,8 @@ ipsec6_output_tunnel(struct ipsec_output_state *state, struct secpolicy *sp, int } ip6 = mtod(m, struct ip6_hdr *); - state->ro = &isr->sav->sah->sa_route; + state->ro = + (struct route *)&isr->sav->sah->route_cache.sin6_route; state->dst = (struct sockaddr *)&state->ro->ro_dst; dst6 = (struct sockaddr_in6 *)state->dst; if (state->ro->ro_rt diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index d00489db9077..e57eb4432bbc 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -2758,9 +2758,9 @@ key_delsah(sah) /* remove from tree of SA index */ if (__LIST_CHAINED(sah)) LIST_REMOVE(sah, chain); - if (sah->sa_route.ro_rt) { - RTFREE(sah->sa_route.ro_rt); - sah->sa_route.ro_rt = (struct rtentry *)NULL; + if (sah->route_cache.sa_route.ro_rt) { + RTFREE(sah->route_cache.sa_route.ro_rt); + sah->route_cache.sa_route.ro_rt = (struct rtentry *)NULL; } free(sah, M_IPSEC_SAH); } @@ -7925,7 +7925,7 @@ key_sa_routechange(dst) SAHTREE_LOCK(); LIST_FOREACH(sah, &V_sahtree, chain) { - ro = &sah->sa_route; + ro = &sah->route_cache.sa_route; if (ro->ro_rt && dst->sa_len == ro->ro_dst.sa_len && bcmp(dst, &ro->ro_dst, dst->sa_len) == 0) { RTFREE(ro->ro_rt); diff --git a/sys/netipsec/keydb.h b/sys/netipsec/keydb.h index 07e1f6024e0c..7494f5f4f3f9 100644 --- a/sys/netipsec/keydb.h +++ b/sys/netipsec/keydb.h @@ -85,6 +85,12 @@ struct seclifetime { u_int64_t usetime; }; +union sa_route_union { + struct route sa_route; + struct route sin_route; /* Duplicate for consistency. */ + struct route_in6 sin6_route; +}; + /* Security Association Data Base */ struct secashead { LIST_ENTRY(secashead) chain; @@ -100,7 +106,7 @@ struct secashead { /* SA chain */ /* The first of this list is newer SA */ - struct route sa_route; /* route cache */ + union sa_route_union route_cache; }; struct xformsw; |