Skip to contentSkip to conversation

xfrm_policy_destroy: rename and relative fixes

PATCH Applied WANG Cong 3 participants 3 messages Jan 3, 2008 – Jan 8, 2008

Subsystems (3)
Networking Network drivers Networking IPsec
lore
Share & tools
lore

WANG Cong

author
#0 lore raw

PATCH 1/1 xfrm_policy_destroy: rename and relative fixes

Since __xfrm_policy_destroy is used to destory the resources allocated by xfrm_policy_alloc. So using the name __xfrm_policy_destroy is not correspond with xfrm_policy_alloc. Rename it to xfrm_policy_destroy.

And along with some instances that call xfrm_policy_alloc but not using xfrm_policy_destroy to destroy the resource, fix them.

Cc David Miller <[email protected]>
Cc Herbert Xu <[email protected]>
Signed-off-by WANG Cong <[email protected]>

---

include/net/xfrm.h +2 -2
index 58dfa82..6eff085 100644
@@ -505,12 +505,12 @@ static inline void xfrm_pol_hold(struct xfrm_policy *policy)
 		atomic_inc(&policy->refcnt);
 }
 
-extern void __xfrm_policy_destroy(struct xfrm_policy *policy);
+extern void xfrm_policy_destroy(struct xfrm_policy *policy);
 
 static inline void xfrm_pol_put(struct xfrm_policy *policy)
 {
 	if (atomic_dec_and_test(&policy->refcnt))
-		__xfrm_policy_destroy(policy);
+		xfrm_policy_destroy(policy);
 }
 
 #ifdef CONFIG_XFRM_SUB_POLICY
net/key/af_key.c +2 -4
index 26d5e63..3667f44 100644
@@ -2291,8 +2291,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
 	return 0;
 
 out:
-	security_xfrm_policy_free(xp);
-	kfree(xp);
+	xfrm_policy_destroy(xp);
 	return err;
 }
 

@@ -3236,8 +3235,7 @@ static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt,
 	return xp;
 
 out:
-	security_xfrm_policy_free(xp);
-	kfree(xp);
+	xfrm_policy_destroy(xp);
 	return NULL;
 }
net/xfrm/xfrm_policy.c +2 -2
index 26b846e..087484e 100644
@@ -206,7 +206,7 @@ EXPORT_SYMBOL(xfrm_policy_alloc);
 
 /* Destroy xfrm_policy: descendant resources must be released to this moment. */
 
-void __xfrm_policy_destroy(struct xfrm_policy *policy)
+void xfrm_policy_destroy(struct xfrm_policy *policy)
 {
 	BUG_ON(!policy->dead);
 

@@ -218,7 +218,7 @@ void __xfrm_policy_destroy(struct xfrm_policy *policy)
 	security_xfrm_policy_free(policy);
 	kfree(policy);
 }
-EXPORT_SYMBOL(__xfrm_policy_destroy);
+EXPORT_SYMBOL(xfrm_policy_destroy);
 
 static void xfrm_policy_gc_kill(struct xfrm_policy *policy)
 {
net/xfrm/xfrm_user.c +1 -1
index e75dbdc..73cc755 100644
@@ -1048,7 +1048,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
 	return xp;
  error:
 	*errp = err;
-	kfree(xp);
+	xfrm_policy_destroy(xp);
 	return NULL;
 }
maintainer
#1 lore raw
Quoted 6 lines · WANG Cong

Since __xfrm_policy_destroy is used to destory the resources allocated by xfrm_policy_alloc. So using the name __xfrm_policy_destroy is not correspond with xfrm_policy_alloc. Rename it to xfrm_policy_destroy.

Quoted 7 lines

And along with some instances that call xfrm_policy_alloc but not using xfrm_policy_destroy to destroy the resource, fix them.

Cc David Miller <[email protected]>
Cc Herbert Xu <[email protected]>
Signed-off-by WANG Cong <[email protected]>

This patch looks OK to me.

Thanks,

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
maintainer Applied
#2 lore raw

From: Herbert Xu <[email protected]>
Date: Tue, 8 Jan 2008 17:15:16 +1100

Quoted 11 lines · WANG Cong
Quoted 10 lines

Since __xfrm_policy_destroy is used to destory the resources allocated by xfrm_policy_alloc. So using the name __xfrm_policy_destroy is not correspond with xfrm_policy_alloc. Rename it to xfrm_policy_destroy.

And along with some instances that call xfrm_policy_alloc but not using xfrm_policy_destroy to destroy the resource, fix them.

Quoted 5 lines
Quoted 3 lines
Cc David Miller <[email protected]>
Cc Herbert Xu <[email protected]>
Signed-off-by WANG Cong <[email protected]>

This patch looks OK to me.

Applied, thanks everyone.