diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2005-10-30 15:03:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:37:29 -0800 |
| commit | 9090e6db87e3bdb2a2c187ebc0f9175a9f9e5c6f (patch) | |
| tree | 46e4a5a27f9d6c694aec2ffba54f90947e8b0477 /drivers/char/hpet.c | |
| parent | 874ec33ff9ccf3651590697a2c2923b911bf31d0 (diff) | |
| download | op-kernel-dev-9090e6db87e3bdb2a2c187ebc0f9175a9f9e5c6f.zip op-kernel-dev-9090e6db87e3bdb2a2c187ebc0f9175a9f9e5c6f.tar.gz | |
[PATCH] hpet: disallow zero interrupt frequency
Disallow setting an interrupt frequency of zero (which would result in a
division by zero), and disallow enabling the interrupt when the frequency
hasn't yet been set (which would use an interrupt period of zero).
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index c055bb6..b619ca5 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -364,6 +364,9 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp) hpet = devp->hd_hpet; hpetp = devp->hd_hpets; + if (!devp->hd_ireqfreq) + return -EIO; + v = readq(&timer->hpet_config); spin_lock_irq(&hpet_lock); @@ -516,7 +519,7 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel) break; } - if (arg & (arg - 1)) { + if (!arg || (arg & (arg - 1))) { err = -EINVAL; break; } |
