* [PATCH] xfrm: Fix xfrm_state_migrate leak
@ 2010-12-07 9:28 Steffen Klassert
2010-12-07 9:31 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Steffen Klassert @ 2010-12-07 9:28 UTC (permalink / raw)
To: David Miller; +Cc: Herbert Xu, Thomas Egerer, netdev
From: Thomas Egerer <thomas.egerer@secunet.com>
xfrm_state_migrate calls kfree instead of xfrm_state_put to free
a failed state. According to git commit 553f9118 this can cause
memory leaks.
Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/xfrm/xfrm_state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index eb96ce5..220ebc0 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1268,7 +1268,7 @@ struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
return xc;
error:
- kfree(xc);
+ xfrm_state_put(xc);
return NULL;
}
EXPORT_SYMBOL(xfrm_state_migrate);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] xfrm: Fix xfrm_state_migrate leak
2010-12-07 9:28 [PATCH] xfrm: Fix xfrm_state_migrate leak Steffen Klassert
@ 2010-12-07 9:31 ` Herbert Xu
2010-12-10 4:36 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2010-12-07 9:31 UTC (permalink / raw)
To: Steffen Klassert; +Cc: David Miller, Thomas Egerer, netdev
On Tue, Dec 07, 2010 at 10:28:56AM +0100, Steffen Klassert wrote:
> From: Thomas Egerer <thomas.egerer@secunet.com>
>
> xfrm_state_migrate calls kfree instead of xfrm_state_put to free
> a failed state. According to git commit 553f9118 this can cause
> memory leaks.
>
> Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Good catch. Thanks!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xfrm: Fix xfrm_state_migrate leak
2010-12-07 9:31 ` Herbert Xu
@ 2010-12-10 4:36 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2010-12-10 4:36 UTC (permalink / raw)
To: herbert; +Cc: steffen.klassert, thomas.egerer, netdev
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 7 Dec 2010 17:31:57 +0800
> On Tue, Dec 07, 2010 at 10:28:56AM +0100, Steffen Klassert wrote:
>> From: Thomas Egerer <thomas.egerer@secunet.com>
>>
>> xfrm_state_migrate calls kfree instead of xfrm_state_put to free
>> a failed state. According to git commit 553f9118 this can cause
>> memory leaks.
>>
>> Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
>> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
>
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> Good catch. Thanks!
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-10 4:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 9:28 [PATCH] xfrm: Fix xfrm_state_migrate leak Steffen Klassert
2010-12-07 9:31 ` Herbert Xu
2010-12-10 4:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).