From: Thomas Egerer <thomas.egerer@secunet.com>
Date: Mon, 6 Dec 2010 23:28:56 +0000 (+0000)
Subject: xfrm: Fix xfrm_state_migrate leak
X-Git-Tag: v2.6.37-rc6~14^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=78347c8c6b2ddf20535bc1b18d749a3bbdea2a60;p=~shefty%2Frdma-dev.git

xfrm: Fix xfrm_state_migrate leak

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index eb96ce52f17..220ebc05c7a 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);