lkml.org 
[lkml]   [2017]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/6] ipc: Make sys_semtimedop() y2038 safe
Date
struct timespec is not y2038 safe on 32 bit machines.
Replace timespec with y2038 safe struct timespec64.

Note that the patch only changes the internals without
modifying the syscall interface. This will be part
of a separate series.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
---
ipc/sem.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ipc/sem.c b/ipc/sem.c
index 8b3b40c54a58..b41cd00d104c 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1861,7 +1861,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
}

static long do_semtimedop(int semid, struct sembuf __user *tsops,
- unsigned nsops, const struct timespec *timeout)
+ unsigned nsops, const struct timespec64 *timeout)
{
int error = -EINVAL;
struct sem_array *sma;
@@ -1897,7 +1897,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
error = -EINVAL;
goto out_free;
}
- jiffies_left = timespec_to_jiffies(timeout);
+ jiffies_left = timespec64_to_jiffies(timeout);
}

max = 0;
@@ -2116,8 +2116,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
unsigned, nsops, const struct timespec __user *, timeout)
{
if (timeout) {
- struct timespec ts;
- if (copy_from_user(&ts, timeout, sizeof(*timeout)))
+ struct timespec64 ts;
+ if (get_timespec64(&ts, timeout))
return -EFAULT;
return do_semtimedop(semid, tsops, nsops, &ts);
}
@@ -2130,8 +2130,8 @@ COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
const struct compat_timespec __user *, timeout)
{
if (timeout) {
- struct timespec ts;
- if (compat_get_timespec(&ts, timeout))
+ struct timespec64 ts;
+ if (compat_get_timespec64(&ts, timeout))
return -EFAULT;
return do_semtimedop(semid, tsems, nsops, &ts);
}
--
2.11.0
\
 
 \ /
  Last update: 2017-07-28 20:09    [W:0.065 / U:1.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site