| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 3 Dec 2017 16:55:42 -0800
From: Deepa Dinamani <deepa.kernel@...il.com>
To: dmitry.torokhov@...il.com, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: arnd@...db.de, y2038@...ts.linaro.org
Subject: [PATCH v3 1/4] uinput: Add ioctl for using monotonic/ boot times
struct timeval which is part of struct input_event to
maintain the event times is not y2038 safe.
Real time timestamps are also not ideal for input_event
as this time can go backwards as noted in the patch
a80b83b7b8 by John Stultz.
Arnd Bergmann suggested deprecating real time and using
monotonic or other timers for all input_event times as a
solution to both the above problems.
Add a new ioctl to let the user dictate the kind of time
to be used for input events. This is similar to the evdev
implementation of the feature. Realtime is still the
default time. This is to maintain backward compatibility.
The structure to maintain input events will be changed
in a different patch.
Signed-off-by: Deepa Dinamani <deepa.kernel@...il.com>
---
drivers/input/misc/uinput.c | 57 ++++++++++++++++++++++++++++++++++++++++++++-
include/uapi/linux/uinput.h | 3 +++
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 39ddd9a73feb..5a450dc04a94 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -74,6 +74,7 @@ struct uinput_device {
unsigned char tail;
struct input_event buff[UINPUT_BUFFER_SIZE];
unsigned int ff_effects_max;
+ unsigned int clk_type;
struct uinput_request *requests[UINPUT_NUM_REQUESTS];
wait_queue_head_t requests_waitq;
@@ -84,11 +85,26 @@ static int uinput_dev_event(struct input_dev *dev,
unsigned int type, unsigned int code, int value)
{
struct uinput_device *udev = input_get_drvdata(dev);
+ struct timespec64 ts;
udev->buff[udev->head].type = type;
udev->buff[udev->head].code = code;
udev->buff[udev->head].value = value;
- do_gettimeofday(&udev->buff[udev->head].time);
+
+ switch (udev->clk_type) {
+ case CLOCK_REALTIME:
+ ktime_get_real_ts64(&ts);
+ break;
+ case CLOCK_MONOTONIC:
+ ktime_get_ts64(&ts);
+ break;
+ case CLOCK_BOOTTIME:
+ get_monotonic_boottime64(&ts);
+ break;
+ }
+
+ udev->buff[udev->head].time.tv_sec = ts.tv_sec;
+ udev->buff[udev->head].time.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
udev->head = (udev->head + 1) % UINPUT_BUFFER_SIZE;
wake_up_interruptible(&udev->waitq);
@@ -370,6 +386,7 @@ static int uinput_create_device(struct uinput_device *udev)
if (error)
goto fail2;
+ udev->clk_type = CLOCK_REALTIME;
udev->state = UIST_CREATED;
return 0;
@@ -379,6 +396,38 @@ static int uinput_create_device(struct uinput_device *udev)
return error;
}
+static int uinput_set_clk_type(struct uinput_device *udev, unsigned int clkid)
+{
+ unsigned int clk_type;
+
+ if (udev->state != UIST_CREATED)
+ return -EINVAL;
+
+ switch (clkid) {
+ /* Realtime clock is only valid until year 2038.*/
+ case CLOCK_REALTIME:
+ clk_type = CLOCK_REALTIME;
+ break;
+ case CLOCK_MONOTONIC:
+ clk_type = CLOCK_MONOTONIC;
+ break;
+ case CLOCK_BOOTTIME:
+ clk_type = CLOCK_BOOTTIME;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (udev->clk_type != clk_type) {
+ udev->clk_type = clk_type;
+
+ /* Flush pending events */
+ uinput_flush_requests(udev);
+ }
+
+ return 0;
+}
+
static int uinput_open(struct inode *inode, struct file *file)
{
struct uinput_device *newdev;
@@ -850,6 +899,7 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
char *phys;
const char *name;
unsigned int size;
+ int clock_id;
retval = mutex_lock_interruptible(&udev->mutex);
if (retval)
@@ -881,6 +931,11 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
retval = uinput_dev_setup(udev, p);
goto out;
+ case UI_SET_CLOCKID:
+ if (copy_from_user(&clock_id, p, sizeof(unsigned int)))
+ return -EFAULT;
+ return uinput_set_clk_type(udev, clock_id);
+
/* UI_ABS_SETUP is handled in the variable size ioctls */
case UI_SET_EVBIT:
diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h
index c9e677e3af1d..78b480d1b6c3 100644
--- a/include/uapi/linux/uinput.h
+++ b/include/uapi/linux/uinput.h
@@ -134,6 +134,9 @@ struct uinput_abs_setup {
*/
#define UI_ABS_SETUP _IOW(UINPUT_IOCTL_BASE, 4, struct uinput_abs_setup)
+/* Set clockid to be used for timestamps */
+#define UI_SET_CLOCKID _IOW(UINPUT_IOCTL_BASE, 5, int)
+
#define UI_SET_EVBIT _IOW(UINPUT_IOCTL_BASE, 100, int)
#define UI_SET_KEYBIT _IOW(UINPUT_IOCTL_BASE, 101, int)
#define UI_SET_RELBIT _IOW(UINPUT_IOCTL_BASE, 102, int)
--
2.14.1
Powered by blists - more mailing lists