Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ATM]: Clip timer race.

Browse Source 
By inspection, the clip idle timer code is racy on SMP.
Here is a safe version of timer management.
Untested, I don't have ATM hardware.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2006-04-14 15:56:02 -07:00 committed by David S. Miller
parent f3a0592b37
commit 2d9073922b
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/atm/clip.c
View File

@ -54,8 +54,6 @@ static struct net_device *clip_devs;
static struct atm_vcc *atmarpd;
static struct neigh_table clip_tbl;
static struct timer_list idle_timer;
static int start_timer = 1;
static int to_atmarpd(enum atmarp_ctrl_type type,int itf,unsigned long ip)
{
@ -725,13 +723,8 @@ static int atm_init_atmarp(struct atm_vcc *vcc)
return -EADDRINUSE;
}
if (start_timer) {
start_timer = 0;
init_timer(&idle_timer);
idle_timer.expires = jiffies+CLIP_CHECK_INTERVAL*HZ;
idle_timer.function = idle_timer_check;
add_timer(&idle_timer);
}
mod_timer(&idle_timer, jiffies+CLIP_CHECK_INTERVAL*HZ);
atmarpd = vcc;
set_bit(ATM_VF_META,&vcc->flags);
set_bit(ATM_VF_READY,&vcc->flags);
@ -1002,6 +995,8 @@ static int __init atm_clip_init(void)
register_netdevice_notifier(&clip_dev_notifier);
register_inetaddr_notifier(&clip_inet_notifier);
setup_timer(&idle_timer, idle_timer_check, 0);
#ifdef CONFIG_PROC_FS
{
struct proc_dir_entry *p;
@ -1029,8 +1024,7 @@ static void __exit atm_clip_exit(void)
/* First, stop the idle timer, so it stops banging
* on the table.
*/
if (start_timer == 0)
del_timer(&idle_timer);
del_timer_sync(&idle_timer);
/* Next, purge the table, so that the device
* unregister loop below does not hang due to