ipcomp: double free at ipcomp_destroy()
Subsystems (4)
PATCH 1/1 ipcomp: double free at ipcomp_destroy()
Consider using ipcomp with tunnel mode:
pfkey_add -> xfrm_state_init -> x->type->init_state() == ipcomp4_init_state
1. If ipcomp_tunnel_attach() fails, xfrm_state private data (x->data) are freed first time (synchronously), but stale pointer is left.
2. xfrm_state_init() failed, all right, we're going to do error unwind but this time asynchronously and we're going to double free x->data asynchronously.
Fix by clearing x->data pointer, so second time it'll be fine.
Note, second time can happen in quite arbitrary time, double free messages were seen in completely irrelevant functions, e. g.
INFO: Allocated in icmp_sk_init INFO: Freed in icmp_sk_exit [<ffffffff810b5ceb>] kfree+0xab/0x140 [<ffffffff810719ae>] free_sect_attrs (!) [<ffffffff81072353>] free_module
The only common thing was kmalloc-16 cache.
---
net/xfrm/xfrm_ipcomp.c | 1 + 1 file changed, 1 insertion(+)
net/xfrm/xfrm_ipcomp.c +1 -0
@@ -332,6 +332,7 @@ void ipcomp_destroy(struct xfrm_state *x)ipcomp_free_data (ipcd);mutex_unlock (&ipcomp_resource_mutex);kfree (ipcd); + x->data =NULL ; }EXPORT_SYMBOL_GPL (ipcomp_destroy);
Herbert Xu
maintainerQuoted 9 lines · Alexey Dobriyan
Consider using ipcomp with tunnel mode:
pfkey_add -> xfrm_state_init -> x->type->init_state() == ipcomp4_init_state1. If
ipcomp_tunnel_attach()fails,xfrm_stateprivate data (x->data) are freed first time (synchronously), but stale pointer is left.
2.xfrm_state_init()failed, all right, we're going to do error unwind but this time asynchronously and we're going to double freex->dataasynchronously.
Sorry, I don't see the async path, where is it?
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 5 lines · Herbert Xu
Quoted 4 lines · Alexey Dobriyan
Consider using ipcomp with tunnel mode:
pfkey_add->xfrm_state_init->x->type->init_state()==ipcomp4_init_state
Quoted 7 lines
Quoted 5 lines
1. If
ipcomp_tunnel_attach()fails,xfrm_stateprivate data (x->data) are freed first time (synchronously), but stale pointer is left.
2.xfrm_state_init()failed, all right, we're going to do error unwind but this time asynchronously and we're going to double freex->dataasynchronously.Sorry, I don't see the async path, where is it?
pfkey_addpfkey_msg2xfrm_statexfrm_init_state [fails]xfrm_state_put__xfrm_state_destroy [puts xfrm_state into GC list, schedule work]xfrm_state_gc_taskxfrm_state_gc_destroyx->type->destructor
Herbert Xu
maintainerQuoted 9 lines · Alexey Dobriyan
pfkey_addpfkey_msg2xfrm_statexfrm_init_state[fails]xfrm_state_put__xfrm_state_destroy[putsxfrm_stateinto GC list, schedule work]xfrm_state_gc_taskxfrm_state_gc_destroyx->type->destructor
Doh, I was looking at the buggy xfrm_state_clone path (which incidently needs to be fixed to use xfrm_state_put).
How about just getting rid of the ipcomp_destroy call in ipcomp's init_state functions? Calling the destructor twice is a bit iffy even if we can make it work by setting various things to NULL and testing for it.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtHerbert Xu
maintainerQuoted 5 lines · Herbert Xu
How about just getting rid of the
ipcomp_destroycall in ipcomp'sinit_statefunctions? Calling the destructor twice is a bit iffy even if we can make it work by setting various things to NULL and testing for it.
Something like this (totally untested):
net/ipv4/ipcomp.c +1 -5
@@ -124,16 +124,12 @@ static int ipcomp4_init_state(struct xfrm_state *x)if (x->props.mode ==XFRM_MODE_TUNNEL ) { err =ipcomp_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 ipcomp_type = {
net/ipv6/ipcomp6.c +1 -5
@@ -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 =
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 40 lines · Herbert Xu
Quoted 5 lines · Herbert Xu
How about just getting rid of the
ipcomp_destroycall in ipcomp'sinit_statefunctions? Calling the destructor twice is a bit iffy even if we can make it work by setting various things to NULL and testing for it.Something like this (totally untested):
net/ipv4/ipcomp.c +1
-5@@ -124,16 +124,12 @@ static int ipcomp4_init_state(struct xfrm_state *x)if (x->props.mode ==XFRM_MODE_TUNNEL ) { err =ipcomp_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 ipcomp_type = {net/ipv6/ipcomp6.c +0
-1@@ -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;
net/ipv6/ipcomp6.c static int ipcomp6_init_state(struct xfrm_state *x) · line 166
Quoted 10 lines
net/ipv6/ipcomp6.c +1
-4+ goto out; } err =0 ; out:return err; -error_tunnel: -ipcomp_destroy (x); - - goto out;
Then checks for NULL ->tunnel, and NULL ->data should be removed. In fact, I don't quite understand why destruction was done this way, so simply cleared ->data pointer.
Herbert Xu
maintainerQuoted 4 lines · Alexey Dobriyan
Then checks for NULL ->tunnel, and NULL ->data should be removed. In fact, I don't quite understand why destruction was done this way, so simply cleared ->data pointer.
I had a look and I don't think we can do that (unless I misunderstood what you meant).
The NULL ipcd check in ipcomp_destroy is to handle the case where ipcomp_init_state fails before it even gets to allocating ipcd.
While the NULL tunnel check in xfrm_state_delete_tunnel is for the case where we failed before successfully attaching a tunnel.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 8 lines · Herbert Xu
Quoted 5 lines · Herbert Xu
How about just getting rid of the
ipcomp_destroycall in ipcomp'sinit_statefunctions? Calling the destructor twice is a bit iffy even if we can make it work by setting various things to NULL and testing for it.Something like this (totally untested):
OK, it survives beating here.
Quoted 49 lines
net/ipv4/ipcomp.c +1
-5@@ -124,16 +124,12 @@ static int ipcomp4_init_state(struct xfrm_state *x)if (x->props.mode ==XFRM_MODE_TUNNEL ) { err =ipcomp_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 ipcomp_type = {net/ipv6/ipcomp6.c +1
-5@@ -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 =Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 2 lines · Alexey Dobriyan
OK, it survives beating here.
Thanks a lot for testing! I'll do the clean-up you suggested in another patch. Let's get this fixed first.
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.
net/ipv4/ipcomp.c +1 -5
@@ -124,16 +124,12 @@ static int ipcomp4_init_state(struct xfrm_state *x)if (x->props.mode ==XFRM_MODE_TUNNEL ) { err =ipcomp_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 ipcomp_type = {
net/ipv6/ipcomp6.c +1 -5
@@ -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 =
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtFrom: Herbert Xu <[email protected]>
Date: Tue, 16 Feb 2010 13:24:30 +0800
Quoted 12 lines · Alexey Dobriyan
Quoted 2 lines
OK, it survives beating here.
Thanks a lot for testing! I'll do the clean-up you suggested in another patch. Let's get this fixed first.
ipcomp: Avoid duplicate calls to
ipcomp_destroyWhen
ipcomp_tunnel_attachfails we will callipcomp_destroytwice. This may lead to double-frees on certain structures.
Quoted 8 lines
As there is no reason to explicitly call
ipcomp_destroy, this patch removes it from ipcomp*.c and lets the standardxfrm_statedestruction take place.This is based on the discovery and patch by Alexey Dobriyan.
Tested-by Alexey Dobriyan <[email protected]>Signed-off-by Herbert Xu <[email protected]>
Applied to net-2.6
Herbert Xu
maintainerQuoted 3 lines · Herbert Xu
Doh, I was looking at the buggy
xfrm_state_clonepath (which incidently needs to be fixed to usexfrm_state_put).
Here's a fix for that problem.
xfrm: Fix xfrm_state_clone leak
xfrm_state_clone calls kfree instead of xfrm_state_put to free a failed state. Depending on the state of the failed state, it can cause leaks to things like module references.
All states should be freed by xfrm_state_put past the point of xfrm_init_state.
net/xfrm/xfrm_state.c +3 -9
@@ -1102,7 +1102,7 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp)int err = -ENOMEM ;struct xfrm_state *x =xfrm_state_alloc (net);if (!x) - goto error; + goto out;memcpy (&x->id, &orig->id,sizeof (x->id));memcpy (&x->sel, &orig->sel,sizeof (x->sel));
@@ -1160,16 +1160,10 @@ static struct xfrm_state *xfrm_state_clone(struct xfrm_state *orig, int *errp)return x; error: +xfrm_state_put (x); +out:if (errp) *errp = err; -if (x) { -kfree (x->aalg); -kfree (x->ealg); -kfree (x->calg); -kfree (x->encap); -kfree (x->coaddr); - } -kfree (x);return NULL ; }
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtFrom: Herbert Xu <[email protected]>
Date: Tue, 16 Feb 2010 14:00:51 +0800
Quoted 9 lines · Herbert Xu
Quoted 3 lines
Doh, I was looking at the buggy
xfrm_state_clonepath (which incidently needs to be fixed to usexfrm_state_put).Here's a fix for that problem.
xfrm: Fix
xfrm_state_cloneleak
Quoted 8 lines
xfrm_state_clonecalls kfree instead ofxfrm_state_putto free a failed state. Depending on the state of the failed state, it can cause leaks to things like module references.All states should be freed by
xfrm_state_putpast the point ofxfrm_init_state.Signed-off-by Herbert Xu <[email protected]>
Applied to net-2.6