Commit 64c31b3f76482bb64459e786f9eca3bd0164d153
Committed by
David S. Miller
David S. Miller
1 parent
d66e37a99d
Exists in
master
and in
7 other branches
[XFRM] 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. 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>
Showing 4 changed files with 7 additions and 9 deletions Side-by-side Diff
include/net/xfrm.h
| ... | ... | @@ -626,12 +626,12 @@ |
| 626 | 626 | atomic_inc(&policy->refcnt); |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | -extern void __xfrm_policy_destroy(struct xfrm_policy *policy); | |
| 629 | +extern void xfrm_policy_destroy(struct xfrm_policy *policy); | |
| 630 | 630 | |
| 631 | 631 | static inline void xfrm_pol_put(struct xfrm_policy *policy) |
| 632 | 632 | { |
| 633 | 633 | if (atomic_dec_and_test(&policy->refcnt)) |
| 634 | - __xfrm_policy_destroy(policy); | |
| 634 | + xfrm_policy_destroy(policy); | |
| 635 | 635 | } |
| 636 | 636 | |
| 637 | 637 | #ifdef CONFIG_XFRM_SUB_POLICY |
net/key/af_key.c
| ... | ... | @@ -2291,8 +2291,7 @@ |
| 2291 | 2291 | return 0; |
| 2292 | 2292 | |
| 2293 | 2293 | out: |
| 2294 | - security_xfrm_policy_free(xp); | |
| 2295 | - kfree(xp); | |
| 2294 | + xfrm_policy_destroy(xp); | |
| 2296 | 2295 | return err; |
| 2297 | 2296 | } |
| 2298 | 2297 | |
| ... | ... | @@ -3236,8 +3235,7 @@ |
| 3236 | 3235 | return xp; |
| 3237 | 3236 | |
| 3238 | 3237 | out: |
| 3239 | - security_xfrm_policy_free(xp); | |
| 3240 | - kfree(xp); | |
| 3238 | + xfrm_policy_destroy(xp); | |
| 3241 | 3239 | return NULL; |
| 3242 | 3240 | } |
| 3243 | 3241 |
net/xfrm/xfrm_policy.c
| ... | ... | @@ -221,7 +221,7 @@ |
| 221 | 221 | |
| 222 | 222 | /* Destroy xfrm_policy: descendant resources must be released to this moment. */ |
| 223 | 223 | |
| 224 | -void __xfrm_policy_destroy(struct xfrm_policy *policy) | |
| 224 | +void xfrm_policy_destroy(struct xfrm_policy *policy) | |
| 225 | 225 | { |
| 226 | 226 | BUG_ON(!policy->dead); |
| 227 | 227 | |
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | security_xfrm_policy_free(policy); |
| 234 | 234 | kfree(policy); |
| 235 | 235 | } |
| 236 | -EXPORT_SYMBOL(__xfrm_policy_destroy); | |
| 236 | +EXPORT_SYMBOL(xfrm_policy_destroy); | |
| 237 | 237 | |
| 238 | 238 | static void xfrm_policy_gc_kill(struct xfrm_policy *policy) |
| 239 | 239 | { |