* [PATCH] net_sched: potential jiffy wrap bug in dev_watchdog
@ 2006-05-15 23:28 Stephen Hemminger
2006-05-16 5:12 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2006-05-15 23:28 UTC (permalink / raw)
To: David S. Miller; +Cc: netdev
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>
--- linux-2.6.orig/net/sched/sch_generic.c
+++ linux-2.6/net/sched/sch_generic.c
@@ -193,8 +193,10 @@ static void dev_watchdog(unsigned long a
netif_running(dev) &&
netif_carrier_ok(dev)) {
if (netif_queue_stopped(dev) &&
- (jiffies - dev->trans_start) > dev->watchdog_timeo) {
- printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n", dev->name);
+ time_after(jiffies, dev->trans_start + dev->watchdog_timeo)) {
+
+ printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n",
+ dev->name);
dev->tx_timeout(dev);
}
if (!mod_timer(&dev->watchdog_timer, jiffies + dev->watchdog_timeo))
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] net_sched: potential jiffy wrap bug in dev_watchdog
2006-05-15 23:28 [PATCH] net_sched: potential jiffy wrap bug in dev_watchdog Stephen Hemminger
@ 2006-05-16 5:12 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2006-05-16 5:12 UTC (permalink / raw)
To: shemminger; +Cc: netdev
From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 15 May 2006 16:28:58 -0700
> 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>
Applied, thanks Stephen.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-05-16 5:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-15 23:28 [PATCH] net_sched: potential jiffy wrap bug in dev_watchdog Stephen Hemminger
2006-05-16 5:12 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).