iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XFRM] xfrm_policy_destroy: Rename and relative fixes.

Browse Source 
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.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong 2008-01-07 22:34:29 -08:00 committed by David S. Miller
parent d66e37a99d
commit 64c31b3f76
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/xfrm.h
View File

@ -626,12 +626,12 @@ static inline void xfrm_pol_hold(struct xfrm_policy *policy)
atomic_inc(&policy->refcnt); 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) static inline void xfrm_pol_put(struct xfrm_policy *policy)
{ {
if (atomic_dec_and_test(&policy->refcnt)) if (atomic_dec_and_test(&policy->refcnt))
__xfrm_policy_destroy(policy); xfrm_policy_destroy(policy);
} }
#ifdef CONFIG_XFRM_SUB_POLICY #ifdef CONFIG_XFRM_SUB_POLICY

6
net/key/af_key.c
View File

@ -2291,8 +2291,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
return 0; return 0;
out: out:
security_xfrm_policy_free(xp); xfrm_policy_destroy(xp);
kfree(xp);
return err; return err;
} }
@ -3236,8 +3235,7 @@ static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt,
return xp; return xp;
out: out:
security_xfrm_policy_free(xp); xfrm_policy_destroy(xp);
kfree(xp);
return NULL; return NULL;
} }

4
net/xfrm/xfrm_policy.c
View File

@ -221,7 +221,7 @@ EXPORT_SYMBOL(xfrm_policy_alloc);
/* Destroy xfrm_policy: descendant resources must be released to this moment. */ /* 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); BUG_ON(!policy->dead);
@ -233,7 +233,7 @@ void __xfrm_policy_destroy(struct xfrm_policy *policy)
security_xfrm_policy_free(policy); security_xfrm_policy_free(policy);
kfree(policy); kfree(policy);
} }
EXPORT_SYMBOL(__xfrm_policy_destroy); EXPORT_SYMBOL(xfrm_policy_destroy);
static void xfrm_policy_gc_kill(struct xfrm_policy *policy) static void xfrm_policy_gc_kill(struct xfrm_policy *policy)
{ {

2
net/xfrm/xfrm_user.c
View File

@ -1043,7 +1043,7 @@ static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p,
return xp; return xp;
error: error:
*errp = err; *errp = err;
kfree(xp); xfrm_policy_destroy(xp);
return NULL; return NULL;
} }