lkml.org 
[lkml]   [2006]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] rtc subsystem, fix capability checks in kernel interface
Alessandro Zummo <alessandro.zummo@towertech.it> wrote:
>
>
> Remove CAP_SYS_XXX checks from the in kernel interface. Those
> functions are meant to be used in-kernel only.
>
> Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
> ---
> drivers/rtc/interface.c | 22 ++++++----------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> --- linux-rtc.orig/drivers/rtc/interface.c 2006-05-17 01:18:19.000000000 +0200
> +++ linux-rtc/drivers/rtc/interface.c 2006-05-17 01:41:17.000000000 +0200
> @@ -229,6 +229,9 @@ int rtc_irq_set_state(struct class_devic
> unsigned long flags;
> struct rtc_device *rtc = to_rtc_device(class_dev);
>
> + if (rtc->ops->irq_set_state == NULL)
> + return -ENXIO;
> +
> spin_lock_irqsave(&rtc->irq_task_lock, flags);
> if (rtc->irq_task != task)
> err = -ENXIO;
> @@ -243,25 +246,12 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_state);
>
> int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq)
> {
> - int err = 0, tmp = 0;
> + int err = 0;
> unsigned long flags;
> struct rtc_device *rtc = to_rtc_device(class_dev);
>
> - /* allowed range is 2-8192 */
> - if (freq < 2 || freq > 8192)
> - return -EINVAL;
> -/*
> - FIXME: this does not belong here, will move where appropriate
> - at a later stage. It cannot hurt right now, trust me :)
> - if ((freq > rtc_max_user_freq) && (!capable(CAP_SYS_RESOURCE)))
> - return -EACCES;
> -*/
> - /* check if freq is a power of 2 */
> - while (freq > (1 << tmp))
> - tmp++;
> -
> - if (freq != (1 << tmp))
> - return -EINVAL;
> + if (rtc->ops->irq_set_freq == NULL)
> + return -ENXIO;
>
> spin_lock_irqsave(&rtc->irq_task_lock, flags);
> if (rtc->irq_task != task)

The changelog and the patch don't have much correlation.

Are you sure this was the right patch?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-05-18 09:00    [W:0.028 / U:0.908 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site