[PATCH 3.4 040/125] ip6mr: call del_timer_sync() in ip6mr_free_table()

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	lizf@kernel.org
Newsgroups	linux.kernel
Subject	[PATCH 3.4 040/125] ip6mr: call del_timer_sync() in ip6mr_free_table()
Date	Wed, 12 Oct 2016 15:00:01 +0200
Message-ID	<srrix-4vs-13@gated-at.bofh.it> (permalink)
References	<srqZb-4nM-3@gated-at.bofh.it>
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	35
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, WANG Cong <xiyou.wangcong@gmail.com>, Hannes Frederic Sowa <hannes@stressinduktion.org>, "David S. Miller" <davem@davemloft.net>, Zefan Li <lizefan@huawei.com>
X-Original-Date	Wed, 12 Oct 2016 20:32:36 +0800
X-Original-Message-ID	<1476275641-4697-40-git-send-email-lizf@kernel.org>
X-Original-References	<1476275600-4626-1-git-send-email-lizf@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1499583

Show key headers only | View raw

From: WANG Cong <xiyou.wangcong@gmail.com>

3.4.113-rc1 review patch.  If anyone has any objections, please let me know.

------------------


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>
---
 net/ipv6/ip6mr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index abe1f76..84cf871 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);
 }
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.4 040/125] ip6mr: call del_timer_sync() in ip6mr_free_table() lizf@kernel.org - 2016-10-12 15:00 +0200

csiph-web