y2038: ipc: Use ktime_get_real_seconds consistently

In some places, we still used get_seconds() instead of
ktime_get_real_seconds(), and I'm changing the remaining ones now to
all use ktime_get_real_seconds() so we use the full available range for
timestamps instead of overflowing the 'unsigned long' return value in
year 2106 on 32-bit kernels.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/ipc/msg.c b/ipc/msg.c
index 56fd1c73eedccc93ea3f26f0f74e9dbe2c5b7bf8..574f76c9a2fff167e50ddd4b5f9f0290ca24c634 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -758,7 +758,7 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg,
                                WRITE_ONCE(msr->r_msg, ERR_PTR(-E2BIG));
                        } else {
                                ipc_update_pid(&msq->q_lrpid, task_pid(msr->r_tsk));
-                               msq->q_rtime = get_seconds();
+                               msq->q_rtime = ktime_get_real_seconds();
 
                                wake_q_add(wake_q, msr->r_tsk);
                                WRITE_ONCE(msr->r_msg, msg);
@@ -859,7 +859,7 @@ static long do_msgsnd(int msqid, long mtype, void __user *mtext,
        }
 
        ipc_update_pid(&msq->q_lspid, task_tgid(current));
-       msq->q_stime = get_seconds();
+       msq->q_stime = ktime_get_real_seconds();
 
        if (!pipelined_send(msq, msg, &wake_q)) {
                /* no one is waiting for this message, enqueue it */
@@ -1087,7 +1087,7 @@ static long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, in
 
                        list_del(&msg->m_list);
                        msq->q_qnum--;
-                       msq->q_rtime = get_seconds();
+                       msq->q_rtime = ktime_get_real_seconds();
                        ipc_update_pid(&msq->q_lrpid, task_tgid(current));
                        msq->q_cbytes -= msg->m_ts;
                        atomic_sub(msg->m_ts, &ns->msg_bytes);

diff --git a/ipc/sem.c b/ipc/sem.c
index 06be75d9217ace222500b2ebfa276bdee524f6e3..c6a8a971769dafa4ff457393c72dca45e43c4579 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -104,7 +104,7 @@ struct sem {
                                        /* that alter the semaphore */
        struct list_head pending_const; /* pending single-sop operations */
                                        /* that do not alter the semaphore*/
-       time_t  sem_otime;      /* candidate for sem_otime */
+       time64_t         sem_otime;     /* candidate for sem_otime */
 } ____cacheline_aligned_in_smp;
 
 /* One sem_array data structure for each set of semaphores in the system. */
@@ -984,10 +984,10 @@ again:
 static void set_semotime(struct sem_array *sma, struct sembuf *sops)
 {
        if (sops == NULL) {
-               sma->sems[0].sem_otime = get_seconds();
+               sma->sems[0].sem_otime = ktime_get_real_seconds();
        } else {
                sma->sems[sops[0].sem_num].sem_otime =
-                                                       get_seconds();
+                                               ktime_get_real_seconds();
        }
 }