diff options
| author | Arnd Bergmann | 2018-06-18 17:09:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-06-28 14:57:06 +0200 |
| commit | 10c553b154c725e27da2f09e45692222f97beb6e (patch) | |
| tree | ef3dae3f253ecf0710dc1c8074f33e21294d0344 /drivers/staging/android | |
| parent | staging: android: ashmem: Fix mmap size validation (diff) | |
| download | kernel-qcow2-linux-10c553b154c725e27da2f09e45692222f97beb6e.tar.gz kernel-qcow2-linux-10c553b154c725e27da2f09e45692222f97beb6e.tar.xz kernel-qcow2-linux-10c553b154c725e27da2f09e45692222f97beb6e.zip | |
staging: android/vsoc: stop using 'timespec'
The timespec structure suffers from the y2038 overflow and should not
be used. This changes handle_vsoc_cond_wait() to use ktime_t directly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Martijn Coenen <maco@android.com>
Tested-by: Alistair Strachan <astrachan@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/vsoc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c index 806beda1040b..22571abcaa4e 100644 --- a/drivers/staging/android/vsoc.c +++ b/drivers/staging/android/vsoc.c @@ -405,7 +405,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg) int ret = 0; struct vsoc_device_region *region_p = vsoc_region_from_filep(filp); atomic_t *address = NULL; - struct timespec ts; + ktime_t wake_time; /* Ensure that the offset is aligned */ if (arg->offset & (sizeof(uint32_t) - 1)) @@ -433,14 +433,13 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg) * We do things this way to flatten differences between 32 bit * and 64 bit timespecs. */ - ts.tv_sec = arg->wake_time_sec; - ts.tv_nsec = arg->wake_time_nsec; - - if (!timespec_valid(&ts)) + if (arg->wake_time_nsec >= NSEC_PER_SEC) return -EINVAL; + wake_time = ktime_set(arg->wake_time_sec, arg->wake_time_nsec); + hrtimer_init_on_stack(&to->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); - hrtimer_set_expires_range_ns(&to->timer, timespec_to_ktime(ts), + hrtimer_set_expires_range_ns(&to->timer, wake_time, current->timer_slack_ns); hrtimer_init_sleeper(to, current); |