summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFan Du <fan.du@windriver.com>2013-08-01 18:08:36 +0800
committerSteffen Klassert <steffen.klassert@secunet.com>2013-08-06 06:59:18 +0200
commit0659eea912cf2ce65298784b918904ba0f91f5e1 (patch)
tree603a0e4d8d6ff7bf07e736e4b073b0d3937693ba
parent8603b9556e1727f0de7e43ef448c85ff93347f27 (diff)
downloadop-kernel-dev-0659eea912cf2ce65298784b918904ba0f91f5e1.zip
op-kernel-dev-0659eea912cf2ce65298784b918904ba0f91f5e1.tar.gz
xfrm: Delete hold_timer when destroy policy
Both policy timer and hold_timer need to be deleted when destroy policy Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
-rw-r--r--net/xfrm/xfrm_policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d8da6b8..f7078eb 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -308,7 +308,7 @@ void xfrm_policy_destroy(struct xfrm_policy *policy)
{
BUG_ON(!policy->walk.dead);
- if (del_timer(&policy->timer))
+ if (del_timer(&policy->timer) || del_timer(&policy->polq.hold_timer))
BUG();
security_xfrm_policy_free(policy->security);
OpenPOWER on IntegriCloud