diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-02-15 19:24:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 14:53:24 -0800 |
| commit | 10e7454ed7a2da39f1f6255f63d7df27ab4bb67f (patch) | |
| tree | 467bf2ee42e91914ac679ad871a87ea2ecb3925f /net/ipv6/ipcomp6.c | |
| parent | 1cab819b5e244e1b853c7b440981e6a960da3bfb (diff) | |
| download | talos-obmc-linux-10e7454ed7a2da39f1f6255f63d7df27ab4bb67f.tar.gz talos-obmc-linux-10e7454ed7a2da39f1f6255f63d7df27ab4bb67f.zip | |
ipcomp: Avoid duplicate calls to ipcomp_destroy
When ipcomp_tunnel_attach fails we will call ipcomp_destroy twice.
This may lead to double-frees on certain structures.
As there is no reason to explicitly call ipcomp_destroy, this patch
removes it from ipcomp*.c and lets the standard xfrm_state destruction
take place.
This is based on the discovery and patch by Alexey Dobriyan.
Tested-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipcomp6.c')
| -rw-r--r-- | net/ipv6/ipcomp6.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c index 2f2a5ca2c878..002e6eef9120 100644 --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -154,16 +154,12 @@ static int ipcomp6_init_state(struct xfrm_state *x) if (x->props.mode == XFRM_MODE_TUNNEL) { err = ipcomp6_tunnel_attach(x); if (err) - goto error_tunnel; + goto out; } err = 0; out: return err; -error_tunnel: - ipcomp_destroy(x); - - goto out; } static const struct xfrm_type ipcomp6_type = |
