From: Fan Du <fan.du@windriver.com>
Date: Thu, 1 Aug 2013 10:08:36 +0000 (+0800)
Subject: xfrm: Delete hold_timer when destroy policy
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0659eea912cf2ce65298784b918904ba0f91f5e1;p=linux.git

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>
---

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d8da6b8c6ba8b..f7078eb5b64e2 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);