diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2015-03-31 11:01:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-25 11:58:56 -0800 |
| commit | d1d1a62450fc73499402831c9953a1c269bd10cf (patch) | |
| tree | 170d70f2f5485aa083704e42f76e9e203466ee8a | |
| parent | ec6392c6567bdf3534399df9a2f31ba0c0c0c97a (diff) | |
| download | lwn-d1d1a62450fc73499402831c9953a1c269bd10cf.tar.gz lwn-d1d1a62450fc73499402831c9953a1c269bd10cf.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>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 9ad561152eb6..8b61288e5746 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -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, true); kfree(mrt); } |