Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[AX25] ax25_timer: use mod_timer instead of add_timer

Browse source 
According to one of Jann's OOPS reports it looks like
BUG_ON(timer_pending(timer)) triggers during add_timer()
in ax25_start_t1timer(). This patch changes current use
of: init_timer(), add_timer() and del_timer() to
setup_timer() with mod_timer(), which should be safer
anyway.

Reported-by: Jann Traschewski <jann@gmx.de>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski 2008-02-11 21:36:39 -08:00 committed by David S. Miller
parent 4de211f1a2
commit 21fab4a86a
3 changed files with 23 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/ax25.h
View file

@ -416,6 +416,7 @@ extern void ax25_calculate_rtt(ax25_cb *);
extern void ax25_disconnect(ax25_cb *, int); extern void ax25_disconnect(ax25_cb *, int);
/* ax25_timer.c */ /* ax25_timer.c */
extern void ax25_setup_timers(ax25_cb *);
extern void ax25_start_heartbeat(ax25_cb *); extern void ax25_start_heartbeat(ax25_cb *);
extern void ax25_start_t1timer(ax25_cb *); extern void ax25_start_t1timer(ax25_cb *);
extern void ax25_start_t2timer(ax25_cb *); extern void ax25_start_t2timer(ax25_cb *);

6
net/ax25/af_ax25.c
View file

@ -510,11 +510,7 @@ ax25_cb *ax25_create_cb(void)
skb_queue_head_init(&ax25->ack_queue); skb_queue_head_init(&ax25->ack_queue);
skb_queue_head_init(&ax25->reseq_queue); skb_queue_head_init(&ax25->reseq_queue);
init_timer(&ax25->timer); ax25_setup_timers(ax25);
init_timer(&ax25->t1timer);
init_timer(&ax25->t2timer);
init_timer(&ax25->t3timer);
init_timer(&ax25->idletimer);
ax25_fillin_cb(ax25, NULL); ax25_fillin_cb(ax25, NULL);

60
net/ax25/ax25_timer.c
View file

@ -40,63 +40,45 @@ static void ax25_t2timer_expiry(unsigned long);
static void ax25_t3timer_expiry(unsigned long); static void ax25_t3timer_expiry(unsigned long);
static void ax25_idletimer_expiry(unsigned long); static void ax25_idletimer_expiry(unsigned long);
void ax25_setup_timers(ax25_cb *ax25)
{
setup_timer(&ax25->timer, ax25_heartbeat_expiry, (unsigned long)ax25);
setup_timer(&ax25->t1timer, ax25_t1timer_expiry, (unsigned long)ax25);
setup_timer(&ax25->t2timer, ax25_t2timer_expiry, (unsigned long)ax25);
setup_timer(&ax25->t3timer, ax25_t3timer_expiry, (unsigned long)ax25);
setup_timer(&ax25->idletimer, ax25_idletimer_expiry,
(unsigned long)ax25);
}
void ax25_start_heartbeat(ax25_cb *ax25) void ax25_start_heartbeat(ax25_cb *ax25)
{ {
del_timer(&ax25->timer); mod_timer(&ax25->timer, jiffies + 5 * HZ);
ax25->timer.data = (unsigned long)ax25;
ax25->timer.function = &ax25_heartbeat_expiry;
ax25->timer.expires = jiffies + 5 * HZ;
add_timer(&ax25->timer);
} }
void ax25_start_t1timer(ax25_cb *ax25) void ax25_start_t1timer(ax25_cb *ax25)
{ {
del_timer(&ax25->t1timer); mod_timer(&ax25->t1timer, jiffies + ax25->t1);
ax25->t1timer.data = (unsigned long)ax25;
ax25->t1timer.function = &ax25_t1timer_expiry;
ax25->t1timer.expires = jiffies + ax25->t1;
add_timer(&ax25->t1timer);
} }
void ax25_start_t2timer(ax25_cb *ax25) void ax25_start_t2timer(ax25_cb *ax25)
{ {
del_timer(&ax25->t2timer); mod_timer(&ax25->t2timer, jiffies + ax25->t2);
ax25->t2timer.data = (unsigned long)ax25;
ax25->t2timer.function = &ax25_t2timer_expiry;
ax25->t2timer.expires = jiffies + ax25->t2;
add_timer(&ax25->t2timer);
} }
void ax25_start_t3timer(ax25_cb *ax25) void ax25_start_t3timer(ax25_cb *ax25)
{ {
del_timer(&ax25->t3timer); if (ax25->t3 > 0)
mod_timer(&ax25->t3timer, jiffies + ax25->t3);
if (ax25->t3 > 0) { else
ax25->t3timer.data = (unsigned long)ax25; del_timer(&ax25->t3timer);
ax25->t3timer.function = &ax25_t3timer_expiry;
ax25->t3timer.expires = jiffies + ax25->t3;
add_timer(&ax25->t3timer);
}
} }
void ax25_start_idletimer(ax25_cb *ax25) void ax25_start_idletimer(ax25_cb *ax25)
{ {
del_timer(&ax25->idletimer); if (ax25->idle > 0)
mod_timer(&ax25->idletimer, jiffies + ax25->idle);
if (ax25->idle > 0) { else
ax25->idletimer.data = (unsigned long)ax25; del_timer(&ax25->idletimer);
ax25->idletimer.function = &ax25_idletimer_expiry;
ax25->idletimer.expires = jiffies + ax25->idle;
add_timer(&ax25->idletimer);
}
} }
void ax25_stop_heartbeat(ax25_cb *ax25) void ax25_stop_heartbeat(ax25_cb *ax25)