Message ID | 20101207092856.GL4639@secunet.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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!
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);