diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2015-03-31 11:01:47 -0700 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2016-10-26 23:15:29 +0800 |
| commit | fdf9925838bfafe6dbbd3072b5596e69f5b9d90b (patch) | |
| tree | 1e4fbeed45d3205f980c6362b69b97121b3cc164 | |
| parent | d547bd0868278d21d4a872fe28532117a8edaff4 (diff) | |
| download | linux-stable-fdf9925838bfafe6dbbd3072b5596e69f5b9d90b.tar.gz linux-stable-fdf9925838bfafe6dbbd3072b5596e69f5b9d90b.tar.bz2 linux-stable-fdf9925838bfafe6dbbd3072b5596e69f5b9d90b.zip | |
ip6mr: call del_timer_sync() in ip6mr_free_table()
commit 7ba0c47c34a1ea5bc7a24ca67309996cce0569b5 upstream.
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>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | net/ipv6/ip6mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index abe1f768b5b6..84cf87116dc7 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -333,7 +333,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); } |