[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.2 2/2] virtio user input: use safe 64-bit time accessors fo
From: |
Ariadne Conill |
Subject: |
[PATCH-for-5.2 2/2] virtio user input: use safe 64-bit time accessors for input_event |
Date: |
Wed, 22 Jul 2020 02:52:26 -0600 |
On 32-bit systems with 64-bit time_t, input_event.time is not
directly accessible. Instead, we must use input_event_sec and
input_event_usec accessors to set the time values.
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
---
contrib/vhost-user-input/main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 6020c6f33a..4887a6cb44 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -115,13 +115,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
static void vi_handle_status(VuInput *vi, virtio_input_event *event)
{
struct input_event evdev;
+ struct timeval tv;
int rc;
- if (gettimeofday(&evdev.time, NULL)) {
+ if (gettimeofday(&tv, NULL)) {
perror("vi_handle_status: gettimeofday");
return;
}
+ evdev.input_event_sec = tv.tv_sec;
+ evdev.input_event_usec = tv.tv_usec;
evdev.type = le16toh(event->type);
evdev.code = le16toh(event->code);
evdev.value = le32toh(event->value);
--
2.27.0