rtc subsystem, add capability checks
PATCH 1/1 rtc subsystem, add capability checks
Centralize CAP_SYS_XXX checks to avoid
duplicate code and missing checks in the drivers.
Signed-off-by Alessandro Zummo <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Yoichi Yuasa <[email protected]>
--- drivers/rtc/class.c | 1 + drivers/rtc/rtc-dev.c | 29 ++++++++++++++++++++++------- drivers/rtc/rtc-sa1100.c | 4 ---- drivers/rtc/rtc-vr41xx.c | 8 -------- include/linux/rtc.h | 1 + 5 files changed, 24 insertions(+), 19 deletions(-)
drivers/rtc/rtc-dev.c +22 -7
@@ -127,6 +127,28 @@ static int rtc_dev_ioctl(struct inode *istruct rtc_wkalrm alarm;void __user *uarg = (void __user *) arg; +/* check that the calles has appropriate permissions +* for certain ioctls. doing this check here is useful +* to avoid duplicate code in each driver. +*/ +switch (cmd) { +case RTC_EPOCH_SET : +case RTC_SET_TIME : +if (!capable (CAP_SYS_TIME )) +return -EACCES ; +break ; + +case RTC_IRQP_SET : +if (arg > rtc->max_user_freq && !capable (CAP_SYS_RESOURCE )) +return -EACCES ; +break ; + +case RTC_PIE_ON : +if (!capable (CAP_SYS_RESOURCE )) +return -EACCES ; +break ; + } +/* avoid conflicting IRQ users */ if (cmd ==RTC_PIE_ON || cmd ==RTC_PIE_OFF || cmd ==RTC_IRQP_SET ) {spin_lock (&rtc->irq_task_lock);
@@ -185,9 +207,6 @@ static int rtc_dev_ioctl(struct inode *ibreak ;case RTC_SET_TIME : -if (!capable (CAP_SYS_TIME )) -return -EACCES ; -if (copy_from_user (&tm, uarg,sizeof (tm)))return -EFAULT ;
@@ -203,10 +222,6 @@ static int rtc_dev_ioctl(struct inode *i err = -EINVAL ; break; } -if (!capable (CAP_SYS_TIME )) { - err = -EACCES ; -break ; - } rtc_epoch = arg; err =0 ;#endif
include/linux/rtc.h +1 -0
@@ -155,6 +155,7 @@ struct rtc_devicestruct rtc_task *irq_task;spinlock_t irq_task_lock;int irq_freq; +int max_user_freq; };#define to_rtc_device (d) container_of(d, struct rtc_device, class_dev)
drivers/rtc/class.c +1 -0
@@ -69,6 +69,7 @@ struct rtc_device *rtc_device_register(c rtc->id = id; rtc->ops = ops; rtc->owner = owner; + rtc->max_user_freq =64 ; rtc->class_dev.dev = dev; rtc->class_dev.class = rtc_class; rtc->class_dev.release = rtc_device_release;
drivers/rtc/rtc-sa1100.c +0 -4
@@ -229,8 +229,6 @@ static int sa1100_rtc_ioctl(struct devicspin_unlock_irq (&sa1100_rtc_lock);return 0 ;case RTC_PIE_ON : -if ((rtc_freq >64 ) && !capable (CAP_SYS_RESOURCE )) -return -EACCES ;spin_lock_irq (&sa1100_rtc_lock);OSMR1 =TIMER_FREQ /rtc_freq +OSCR ;OIER |=OIER_E1 ;
@@ -242,8 +240,6 @@ static int sa1100_rtc_ioctl(struct deviccase RTC_IRQP_SET :if (arg <1 || arg >TIMER_FREQ )return -EINVAL ; -if ((arg >64 ) && (!capable (CAP_SYS_RESOURCE ))) -return -EACCES ; rtc_freq = arg;return 0 ; }
drivers/rtc/rtc-vr41xx.c +0 -8
@@ -81,7 +81,6 @@ MODULE_LICENSE("GPL");#define RTC_FREQUENCY 32768#define MAX_PERIODIC_RATE 6553 -#define MAX_USER_PERIODIC_RATE 64static void __iomem *rtc1_base;static void __iomem *rtc2_base;
@@ -240,9 +239,6 @@ static int vr41xx_rtc_ioctl(struct devicif (arg >MAX_PERIODIC_RATE )return -EINVAL ; -if (arg >MAX_USER_PERIODIC_RATE &&capable (CAP_SYS_RESOURCE ) ==0 ) -return -EACCES ; - periodic_frequency = arg; count =RTC_FREQUENCY ;
@@ -263,10 +259,6 @@ static int vr41xx_rtc_ioctl(struct devic/* Doesn't support before 1900 */ if (arg <1900 )return -EINVAL ; - -if (capable (CAP_SYS_TIME ) ==0 ) -return -EACCES ; - epoch = arg;break ;default :