[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <83f4033d9d33d5f775401f58acdfa39657fd3e39.1266107200.git.matthltc@us.ibm.com>
Date: Sat, 13 Feb 2010 16:27:45 -0800
From: Matt Helsley <matthltc@...ibm.com>
To: linux-kernel@...r.kernel.org
Cc: Matt Helsley <matthltc@...ibm.com>,
Thomas Gleixner <tglx@...utronix.de>,
Davide Libenzi <davidel@...ilserver.org>
Subject: [RFC][PATCH 2/4] anon_inode fcntl() checks: report failure for fcntl(F_SETFL) on timerfd
Report failure when userspace attempts to set unsupported flags
on timerfd files with fcntl().
Signed-off-by: Matt Helsley <matthltc@...ibm.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Davide Libenzi <davidel@...ilserver.org>
---
fs/timerfd.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 1bfc95a..198a564 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -156,7 +156,19 @@ static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
return res;
}
+static int timerfd_check_flags(int flags)
+{
+ /* Check the TFD_* constants for consistency. */
+ BUILD_BUG_ON(TFD_CLOEXEC != O_CLOEXEC);
+ BUILD_BUG_ON(TFD_NONBLOCK != O_NONBLOCK);
+
+ if (flags & ~(TFD_CLOEXEC | TFD_NONBLOCK))
+ return -EINVAL;
+ return 0;
+}
+
static const struct file_operations timerfd_fops = {
+ .check_flags = timerfd_check_flags,
.release = timerfd_release,
.poll = timerfd_poll,
.read = timerfd_read,
@@ -182,10 +194,6 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
int ufd;
struct timerfd_ctx *ctx;
- /* Check the TFD_* constants for consistency. */
- BUILD_BUG_ON(TFD_CLOEXEC != O_CLOEXEC);
- BUILD_BUG_ON(TFD_NONBLOCK != O_NONBLOCK);
-
if ((flags & ~TFD_CREATE_FLAGS) ||
(clockid != CLOCK_MONOTONIC &&
clockid != CLOCK_REALTIME))
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists