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 interfaces themselves are not changed as part of the patch. They will be part of a different series.
Unified · Split
| @@ -12,9 +12,9 @@ struct shmid_kernel /* private to the kernel */ · 11 unmodified lines | |||
| 12 | struct file *shm_file; | 12 | struct file *shm_file; |
| 13 | unsigned long shm_nattch; | 13 | unsigned long shm_nattch; |
| 14 | unsigned long shm_segsz; | 14 | unsigned long shm_segsz; |
| 15 | time_t shm_atim; | 15 | time64_t shm_atim; |
| 16 | time_t shm_dtim; | 16 | time64_t shm_dtim; |
| 17 | time_t shm_ctim; | 17 | time64_t shm_ctim; |
| 18 | pid_t shm_cprid; | 18 | pid_t shm_cprid; |
| 19 | pid_t shm_lprid; | 19 | pid_t shm_lprid; |
| 20 | struct user_struct *mlock_user; | 20 | struct user_struct *mlock_user; |
| @@ -200,7 +200,7 @@ static int __shm_open(struct vm_area_struct *vma) · 199 unmodified lines | |||
| 200 | if (IS_ERR(shp)) | 200 | if (IS_ERR(shp)) |
| 201 | return PTR_ERR(shp); | 201 | return PTR_ERR(shp); |
| 202 | 202 | ||
| 203 | shp->shm_atim = get_seconds(); | 203 | shp->shm_atim = ktime_get_real_seconds(); |
| 204 | shp->shm_lprid = task_tgid_vnr(current); | 204 | shp->shm_lprid = task_tgid_vnr(current); |
| 205 | shp->shm_nattch++; | 205 | shp->shm_nattch++; |
| 206 | shm_unlock(shp); | 206 | shm_unlock(shp); |
| @@ -287,7 +287,7 @@ static void shm_close(struct vm_area_struct *vma) · 80 unmodified lines | |||
| 287 | goto done; /* no-op */ | 287 | goto done; /* no-op */ |
| 288 | 288 | ||
| 289 | shp->shm_lprid = task_tgid_vnr(current); | 289 | shp->shm_lprid = task_tgid_vnr(current); |
| 290 | shp->shm_dtim = get_seconds(); | 290 | shp->shm_dtim = ktime_get_real_seconds(); |
| 291 | shp->shm_nattch--; | 291 | shp->shm_nattch--; |
| 292 | if (shm_may_destroy(ns, shp)) | 292 | if (shm_may_destroy(ns, shp)) |
| 293 | shm_destroy(ns, shp); | 293 | shm_destroy(ns, shp); |
| @@ -592,7 +592,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) · 298 unmodified lines | |||
| 592 | shp->shm_cprid = task_tgid_vnr(current); | 592 | shp->shm_cprid = task_tgid_vnr(current); |
| 593 | shp->shm_lprid = 0; | 593 | shp->shm_lprid = 0; |
| 594 | shp->shm_atim = shp->shm_dtim = 0; | 594 | shp->shm_atim = shp->shm_dtim = 0; |
| 595 | shp->shm_ctim = get_seconds(); | 595 | shp->shm_ctim = ktime_get_real_seconds(); |
| 596 | shp->shm_segsz = size; | 596 | shp->shm_segsz = size; |
| 597 | shp->shm_nattch = 0; | 597 | shp->shm_nattch = 0; |
| 598 | shp->shm_file = file; | 598 | shp->shm_file = file; |
| @@ -846,7 +846,7 @@ static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, · 247 unmodified lines | |||
| 846 | err = ipc_update_perm(&shmid64->shm_perm, ipcp); | 846 | err = ipc_update_perm(&shmid64->shm_perm, ipcp); |
| 847 | if (err) | 847 | if (err) |
| 848 | goto out_unlock0; | 848 | goto out_unlock0; |
| 849 | shp->shm_ctim = get_seconds(); | 849 | shp->shm_ctim = ktime_get_real_seconds(); |
| 850 | break; | 850 | break; |
| 851 | default: | 851 | default: |
| 852 | err = -EINVAL; | 852 | err = -EINVAL; |
| @@ -1586,7 +1586,7 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it) · 733 unmodified lines | |||
| 1586 | 1586 | ||
| 1587 | seq_printf(s, | 1587 | seq_printf(s, |
| 1588 | "%10d %10d %4o " SIZE_SPEC " %5u %5u " | 1588 | "%10d %10d %4o " SIZE_SPEC " %5u %5u " |
| 1589 | "%5lu %5u %5u %5u %5u %10lu %10lu %10lu " | 1589 | "%5lu %5u %5u %5u %5u %10llu %10llu %10llu " |
| 1590 | SIZE_SPEC " " SIZE_SPEC "\n", | 1590 | SIZE_SPEC " " SIZE_SPEC "\n", |
| 1591 | shp->shm_perm.key, | 1591 | shp->shm_perm.key, |
| 1592 | shp->shm_perm.id, | 1592 | shp->shm_perm.id, |