netdev - Re: [PATCH net] xfrm: Delete hold

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 2 Aug 2013 09:22:08 +0800
From:	Fan Du <fan.du@...driver.com>
To:	Steffen Klassert <steffen.klassert@...unet.com>
CC:	<davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: Re: [PATCH net] xfrm: Delete hold_timer when destroy policy



On 2013年08月01日 20:01, Steffen Klassert wrote:
> On Thu, Aug 01, 2013 at 06:08:36PM +0800, Fan Du wrote:
>> Both policy timer and hold_timer need to be deleted when destroy policy
>> Bad mood today, maybe I'm wrong about this...
>>
>> Signed-off-by: Fan Du<fan.du@...driver.com>
>> ---
>>   net/xfrm/xfrm_policy.c |    2 +-
>>   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();
>>
>
> The timers should be already deleted when xfrm_policy_destroy() is
> called. This is just to check if that really happened and to
> catch this bug if not. So it's not a bug fix, it just helps to
> catch a potential bug. I'll consider to take this into ipsec-next
> after some testing.
>

On the contrary, please take a look at callers of xfrm_policy_destroy.
Code flow is as below:

   xfrm_policy_alloc() /* setup timer/hold_timer here */ (1)

   /* do something with this policy, insert or something else */

   goto err; /* bail out if bad things happens */

   return ok

err:
   xfrm_policy_destroy() /*So both timers in (1) need to be deleted */

-- 
浮沉随浪只记今朝笑

--fan
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html