ip6mr: call del_timer_sync() in ip6mr_free_table()
authorWANG Cong <xiyou.wangcong@gmail.com>
Tue, 31 Mar 2015 18:01:47 +0000 (11:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Apr 2015 00:52:35 +0000 (20:52 -0400)
We need to wait for the flying timers, since we
are going to free the mrtable right after it.

Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6mr.c

index 2f1fd9ffcb34aacda122f996e8b5ae294350b412..312e0ff47339be3a3ffa8981c9e1b1cb7f5a551b 100644 (file)
@@ -336,7 +336,7 @@ static struct mr6_table *ip6mr_new_table(struct net *net, u32 id)
 
 static void ip6mr_free_table(struct mr6_table *mrt)
 {
-       del_timer(&mrt->ipmr_expire_timer);
+       del_timer_sync(&mrt->ipmr_expire_timer);
        mroute_clean_tables(mrt);
        kfree(mrt);
 }