diff options
| author | Bryan Kadzban <bryan@kadzban.is-a-geek.net> | 2007-10-16 10:28:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 18:43:13 +0200 |
| commit | 9d013d3b14f4c81bdfe6c81fc506037d60007036 (patch) | |
| tree | c85405897df18b5dae8530a45586811913136716 /drivers/rtc/rtc-dev.c | |
| parent | rtc: add max_user_freq to sysfs (diff) | |
| download | linux-9d013d3b14f4c81bdfe6c81fc506037d60007036.tar.xz linux-9d013d3b14f4c81bdfe6c81fc506037d60007036.zip | |
rtc: allow validated RTC_PIE_ON for non-root
drivers/char/rtc.c allowed RTC_PIE_ON ioctls for non-root users, as long as
the current interval (set via RTC_IRQP_SET) is <= max_user_freq. Allow
RTC_PIE_ON under the same conditions when /dev/rtc* is handled by the rtc
subsystem.
Signed-off-by: Bryan Kadzban <bryan@kdzbn.homelinux.net>
Acked-by: Alessandro Zummo <alessandro.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
| -rw-r--r-- | drivers/rtc/rtc-dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 87d4add6b7f6..814583bd2fe7 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -233,7 +233,8 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, break; case RTC_PIE_ON: - if (!capable(CAP_SYS_RESOURCE)) + if (rtc->irq_freq > rtc->max_user_freq && + !capable(CAP_SYS_RESOURCE)) return -EACCES; break; } |