lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().

Browse Source 
There is a potential jiffy wraparound bug in the transmit watchdog
that is easily avoided by using time_after().

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-05-16 15:02:12 -07:00
committed by David S. Miller
parent 716f8954fb
commit 338f7566e5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/sched/sch_generic.c
View File

@@ -193,8 +193,10 @@ static void dev_watchdog(unsigned long arg)
netif_running(dev) && netif_running(dev) &&
netif_carrier_ok(dev)) { netif_carrier_ok(dev)) {
if (netif_queue_stopped(dev) && if (netif_queue_stopped(dev) &&
(jiffies - dev->trans_start) > dev->watchdog_timeo) { time_after(jiffies, dev->trans_start + dev->watchdog_timeo)) {
printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n", dev->name);
printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n",
dev->name);
dev->tx_timeout(dev); dev->tx_timeout(dev);
} }
if (!mod_timer(&dev->watchdog_timer, jiffies + dev->watchdog_timeo)) if (!mod_timer(&dev->watchdog_timer, jiffies + dev->watchdog_timeo))