From: Eric Caruso <ejcaruso@chromium.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Todd Poynor <toddpoynor@google.com>,
linux-kernel@vger.kernel.org, Eric Caruso <ejcaruso@google.com>
Subject: [PATCH] fs/timerfd: reject ALARM timerfds without CAP_WAKE_ALARM
Date: Wed, 8 Jun 2016 16:08:59 -0700 [thread overview]
Message-ID: <1465427339-96209-1-git-send-email-ejcaruso@chromium.org> (raw)
From: Eric Caruso <ejcaruso@google.com>
timerfd gives processes a way to set wake alarms, but
unlike timers made using timer_create, timerfds don't
check whether the process has CAP_WAKE_ALARM before
setting alarm-time timers. CAP_WAKE_ALARM is supposed to
gate this behavior and so it makes sense that we should
deny permission to create such timerfds if the process
doesn't have this capability.
Signed-off-by: Eric Caruso <ejcaruso@google.com>
---
fs/timerfd.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 053818d..9ae4abb 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);
/*
--
2.8.0.rc3.226.g39d4020
next reply other threads:[~2016-06-08 23:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 23:08 Eric Caruso [this message]
2016-06-09 21:48 ` [tip:timers/core] timerfd: Reject ALARM timerfds without CAP_WAKE_ALARM tip-bot for Eric Caruso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465427339-96209-1-git-send-email-ejcaruso@chromium.org \
--to=ejcaruso@chromium.org \
--cc=ejcaruso@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=toddpoynor@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).