diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-05-20 14:32:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-20 14:32:14 -0700 |
| commit | 1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3 (patch) | |
| tree | 610968ecaa89b3b9144db508dc2bd650afadce74 | |
| parent | 6f704992d3658aadff9e506c7fd80957fce33c5f (diff) | |
| download | linux-3.10-1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3.tar.gz linux-3.10-1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3.tar.bz2 linux-3.10-1ac06e0306d0192a7a4d9ea1c9e06d355ce7e7d3.zip | |
ipsec: Use the correct ip_local_out function
Because the IPsec output function xfrm_output_resume does its
own dst_output call it should always call __ip_local_output
instead of ip_local_output as the latter may invoke dst_output
directly. Otherwise the return values from nf_hook and dst_output
may clash as they both use the value 1 but for different purposes.
When that clash occurs this can cause a packet to be used after
it has been freed which usually leads to a crash. Because the
offending value is only returned from dst_output with qdiscs
such as HTB, this bug is normally not visible.
Thanks to Marco Berizzi for his perseverance in tracking this
down.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/route.c | 2 | ||||
| -rw-r--r-- | net/ipv6/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 92f90ae46f4..df41026b60d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -160,7 +160,7 @@ static struct dst_ops ipv4_dst_ops = { .negative_advice = ipv4_negative_advice, .link_failure = ipv4_link_failure, .update_pmtu = ip_rt_update_pmtu, - .local_out = ip_local_out, + .local_out = __ip_local_out, .entry_size = sizeof(struct rtable), .entries = ATOMIC_INIT(0), }; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index b7a4a875a26..48534c6c073 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -109,7 +109,7 @@ static struct dst_ops ip6_dst_ops_template = { .negative_advice = ip6_negative_advice, .link_failure = ip6_link_failure, .update_pmtu = ip6_rt_update_pmtu, - .local_out = ip6_local_out, + .local_out = __ip6_local_out, .entry_size = sizeof(struct rt6_info), .entries = ATOMIC_INIT(0), }; |