[Y2038] [PATCH v3 2/6] ipc: mqueue: Replace timespec with timespec64

[Deepa Dinamani]

struct timespec is not y2038 safe. Replace
all uses of timespec by y2038 safe struct timespec64.

Even though timespec is used here to represent timeouts,
replace these with timespec64 so that it facilitates
in verification by creating a y2038 safe kernel image
that is free of timespec.

The syscall interfaces themselves are not changed as part
of the patch. They will be part of a different series.

Signed-off-by: Deepa Dinamani 
Cc: Paul Moore 
Cc: Richard Guy Briggs 
Reviewed-by: Richard Guy Briggs 
Reviewed-by: Arnd Bergmann 
Acked-by: Paul Moore 
---
 include/linux/audit.h |  6 +++---
 ipc/mqueue.c  | 28 ++--
 kernel/audit.h|  2 +-
 kernel/auditsc.c  | 12 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 2150bdccfbab..74d4d4e8e3db 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -351,7 +351,7 @@ extern int __audit_socketcall(int nargs, unsigned long 
*args);
 extern int __audit_sockaddr(int len, void *addr);
 extern void __audit_fd_pair(int fd1, int fd2);
 extern void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr);
-extern void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int 
msg_prio, const struct timespec *abs_timeout);
+extern void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int 
msg_prio, const struct timespec64 *abs_timeout);
 extern void __audit_mq_notify(mqd_t mqdes, const struct sigevent 
*notification);
 extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
 extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
@@ -412,7 +412,7 @@ static inline void audit_mq_open(int oflag, umode_t mode, 
struct mq_attr *attr)
if (unlikely(!audit_dummy_context()))
__audit_mq_open(oflag, mode, attr);
 }
-static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int 
msg_prio, const struct timespec *abs_timeout)
+static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int 
msg_prio, const struct timespec64 *abs_timeout)
 {
if (unlikely(!audit_dummy_context()))
__audit_mq_sendrecv(mqdes, msg_len, msg_prio, abs_timeout);
@@ -549,7 +549,7 @@ static inline void audit_mq_open(int oflag, umode_t mode, 
struct mq_attr *attr)
 { }
 static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len,
 unsigned int msg_prio,
-const struct timespec *abs_timeout)
+const struct timespec64 *abs_timeout)
 { }
 static inline void audit_mq_notify(mqd_t mqdes,
   const struct sigevent *notification)
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c9ff943f19ab..5be1346a9167 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -668,11 +668,11 @@ static void __do_notify(struct mqueue_inode_info *info)
 }
 
 static int prepare_timeout(const struct timespec __user *u_abs_timeout,
-  struct timespec *ts)
+  struct timespec64 *ts)
 {
-   if (copy_from_user(ts, u_abs_timeout, sizeof(struct timespec)))
+   if (get_timespec64(ts, u_abs_timeout))
return -EFAULT;
-   if (!timespec_valid(ts))
+   if (!timespec64_valid(ts))
return -EINVAL;
return 0;
 }
@@ -962,7 +962,7 @@ static inline void pipelined_receive(struct wake_q_head 
*wake_q,
 
 static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
size_t msg_len, unsigned int msg_prio,
-   struct timespec *ts)
+   struct timespec64 *ts)
 {
struct fd f;
struct inode *inode;
@@ -979,7 +979,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user 
*u_msg_ptr,
return -EINVAL;
 
if (ts) {
-   expires = timespec_to_ktime(*ts);
+   expires = timespec64_to_ktime(*ts);
timeout = 
}
 
@@ -1080,7 +1080,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user 
*u_msg_ptr,
 
 static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
size_t msg_len, unsigned int __user *u_msg_prio,
-   struct timespec *ts)
+   struct timespec64 *ts)
 {
ssize_t ret;
struct msg_msg *msg_ptr;
@@ -1092,7 +1092,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user 
*u_msg_ptr,
struct posix_msg_tree_node *new_leaf = NULL;
 
if (ts) {
-   expires = timespec_to_ktime(*ts);
+   expires = timespec64_to_ktime(*ts);
timeout = 
}
 
@@ -1184,7 +1184,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char 
__user *, u_msg_ptr,
size_t, msg_len, unsigned int, msg_prio,
const struct timespec 

[Y2038] [PATCH v3 4/6] ipc: sem: Make sem_array timestamps y2038 safe

[Deepa Dinamani]

time_t is not y2038 safe. Replace all uses of
time_t by y2038 safe time64_t.

Similarly, replace the calls to get_seconds() with
y2038 safe ktime_get_real_seconds().
Note that this preserves fast access on 64 bit systems,
but 32 bit systems need sequence counters.

The syscall interface themselves are not changed as part of
the patch. They will be part of a different series.

Signed-off-by: Deepa Dinamani 
Reviewed-by: Arnd Bergmann 
---
 include/linux/sem.h |  3 ++-
 ipc/sem.c   | 18 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/linux/sem.h b/include/linux/sem.h
index 9edec926e9d9..8012ce99f72f 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -4,6 +4,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 struct task_struct;
@@ -11,7 +12,7 @@ struct task_struct;
 /* One sem_array data structure for each set of semaphores in the system. */
 struct sem_array {
struct kern_ipc_permsem_perm;   /* permissions .. see ipc.h */
-   time_t  sem_ctime;  /* last change time */
+   time64_tsem_ctime;  /* last change time */
struct sem  *sem_base;  /* ptr to first semaphore in 
array */
struct list_headpending_alter;  /* pending operations */
/* that alter the array */
diff --git a/ipc/sem.c b/ipc/sem.c
index b41cd00d104c..48e7babdb869 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -518,7 +518,7 @@ static int newary(struct ipc_namespace *ns, struct 
ipc_params *params)
INIT_LIST_HEAD(>pending_const);
INIT_LIST_HEAD(>list_id);
sma->sem_nsems = nsems;
-   sma->sem_ctime = get_seconds();
+   sma->sem_ctime = ktime_get_real_seconds();
 
id = ipc_addid(_ids(ns), >sem_perm, ns->sc_semmni);
if (id < 0) {
@@ -1169,14 +1169,14 @@ static unsigned long copy_semid_to_user(void __user 
*buf, struct semid64_ds *in,
}
 }
 
-static time_t get_semotime(struct sem_array *sma)
+static time64_t get_semotime(struct sem_array *sma)
 {
int i;
-   time_t res;
+   time64_t res;
 
res = sma->sem_base[0].sem_otime;
for (i = 1; i < sma->sem_nsems; i++) {
-   time_t to = sma->sem_base[i].sem_otime;
+   time64_t to = sma->sem_base[i].sem_otime;
 
if (to > res)
res = to;
@@ -1316,7 +1316,7 @@ static int semctl_setval(struct ipc_namespace *ns, int 
semid, int semnum,
 
curr->semval = val;
curr->sempid = task_tgid_vnr(current);
-   sma->sem_ctime = get_seconds();
+   sma->sem_ctime = ktime_get_real_seconds();
/* maybe some queued-up processes were waiting for this */
do_smart_update(sma, NULL, 0, 0, _q);
sem_unlock(sma, -1);
@@ -1442,7 +1442,7 @@ static int semctl_main(struct ipc_namespace *ns, int 
semid, int semnum,
for (i = 0; i < nsems; i++)
un->semadj[i] = 0;
}
-   sma->sem_ctime = get_seconds();
+   sma->sem_ctime = ktime_get_real_seconds();
/* maybe some queued-up processes were waiting for this */
do_smart_update(sma, NULL, 0, 0, _q);
err = 0;
@@ -1552,7 +1552,7 @@ static int semctl_down(struct ipc_namespace *ns, int 
semid,
err = ipc_update_perm(>sem_perm, ipcp);
if (err)
goto out_unlock0;
-   sma->sem_ctime = get_seconds();
+   sma->sem_ctime = ktime_get_real_seconds();
break;
default:
err = -EINVAL;
@@ -2297,7 +2297,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void 
*it)
 {
struct user_namespace *user_ns = seq_user_ns(s);
struct sem_array *sma = it;
-   time_t sem_otime;
+   time64_t sem_otime;
 
/*
 * The proc interface isn't aware of sem_lock(), it calls
@@ -2310,7 +2310,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void 
*it)
sem_otime = get_semotime(sma);
 
seq_printf(s,
-  "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
+  "%10d %10d  %4o %10u %5u %5u %5u %5u %10llu %10llu\n",
   sma->sem_perm.key,
   sma->sem_perm.id,
   sma->sem_perm.mode,
-- 
2.11.0

___
Y2038 mailing list
Y2038@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/y2038

[Y2038] [PATCH v3 0/6] Make ipc y2038 safe

[Deepa Dinamani]

The series aims to transition internal workings of ipc subsystem
to use y2038-safe types and apis.

The series is based on Al Viro's #work.ipc branch.

Changes since v2:
* Removed extra typecasts
Changes since v1:
* Addressed audit review comments

Deepa Dinamani (6):
  ipc: Make sys_semtimedop() y2038 safe
  ipc: mqueue: Replace timespec with timespec64
  ipc: msg: Make msg_queue timestamps y2038 safe
  ipc: sem: Make sem_array timestamps y2038 safe
  ipc: shm: Make shmid_kernel timestamps y2038 safe
  utimes: Make utimes y2038 safe

 fs/utimes.c   | 23 ---
 include/linux/audit.h |  6 +++---
 include/linux/msg.h   |  7 ---
 include/linux/sem.h   |  3 ++-
 include/linux/shm.h   |  6 +++---
 include/linux/time.h  |  2 +-
 init/initramfs.c  |  2 +-
 ipc/mqueue.c  | 28 ++--
 ipc/msg.c |  6 +++---
 ipc/sem.c | 30 +++---
 ipc/shm.c | 10 +-
 kernel/audit.h|  2 +-
 kernel/auditsc.c  | 12 ++--
 13 files changed, 70 insertions(+), 67 deletions(-)

-- 
2.11.0

Cc: Paul Moore 
Cc: Richard Guy Briggs 
___
Y2038 mailing list
Y2038@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/y2038