diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2008-10-15 10:53:06 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-10-15 10:53:06 +0200 |
| commit | 7c2500f17d65092d93345f3996cf82ebca17e9ff (patch) | |
| tree | 5d019244cf993839af05ea08cd0713ec1d1b390a /drivers/watchdog/ib700wdt.c | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| download | linux-7c2500f17d65092d93345f3996cf82ebca17e9ff.tar.xz linux-7c2500f17d65092d93345f3996cf82ebca17e9ff.zip | |
[WATCHDOG] ib700wdt.c - fix buffer_underflow bug
This fixes Bug 11399:
if ibwdt_set_heartbeat(int t) is called with value 30 then
the check "if ((t < 0) || (t > 30))" in ibwdt_set_heartbeat
is not going to fail because t == 30, but in the loop, the
check wd_times[i] > t is never going to be true because
none of the wd_times are greater than the value of t (i.e. 30).
So we are exiting the loop with i == -1 and therefore setting
wd_margin to -1 which is wrong.
Reported-by: Zvonimir Rakamaric <zrakamar@cs.ubc.ca>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ib700wdt.c')
| -rw-r--r-- | drivers/watchdog/ib700wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c index 05a28106e8eb..8782ec1f5aa0 100644 --- a/drivers/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c @@ -154,7 +154,7 @@ static int ibwdt_set_heartbeat(int t) return -EINVAL; for (i = 0x0F; i > -1; i--) - if (wd_times[i] > t) + if (wd_times[i] >= t) break; wd_margin = i; return 0; |