X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Ftimerfd.c;h=9ae4abb4110b84ef286facc88e66be9d954a021d;hb=4f6deb8cbab532a8d7250bc09234c1795ecb5e2c;hp=053818dd6c18be8f228e1c40483e50d78aa78007;hpb=aa6865d836418eb2ba888a4cb1318a28e9aa2e0c;p=deliverable%2Flinux.git diff --git a/fs/timerfd.c b/fs/timerfd.c index 053818dd6c18..9ae4abb4110b 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -390,6 +390,11 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) clockid != CLOCK_BOOTTIME_ALARM)) return -EINVAL; + if (!capable(CAP_WAKE_ALARM) && + (clockid == CLOCK_REALTIME_ALARM || + clockid == CLOCK_BOOTTIME_ALARM)) + return -EPERM; + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; @@ -433,6 +438,11 @@ static int do_timerfd_settime(int ufd, int flags, return ret; ctx = f.file->private_data; + if (!capable(CAP_WAKE_ALARM) && isalarm(ctx)) { + fdput(f); + return -EPERM; + } + timerfd_setup_cancel(ctx, flags); /*