Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: shm: Make shmid_kernel timestamps y2038 safe

Browse Source 
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.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Deepa Dinamani 2017-08-02 19:51:14 -07:00 committed by Al Viro
parent e54d02b23c
commit 7ff2819e8d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/shm.h
View File

@ -12,9 +12,9 @@ struct shmid_kernel /* private to the kernel */
struct file *shm_file; struct file *shm_file;
unsigned long shm_nattch; unsigned long shm_nattch;
unsigned long shm_segsz; unsigned long shm_segsz;
time_t shm_atim; time64_t shm_atim;
time_t shm_dtim; time64_t shm_dtim;
time_t shm_ctim; time64_t shm_ctim;
pid_t shm_cprid; pid_t shm_cprid;
pid_t shm_lprid; pid_t shm_lprid;
struct user_struct *mlock_user; struct user_struct *mlock_user;

10
ipc/shm.c
View File

@ -200,7 +200,7 @@ static int __shm_open(struct vm_area_struct *vma)
if (IS_ERR(shp)) if (IS_ERR(shp))
return PTR_ERR(shp); return PTR_ERR(shp);
shp->shm_atim = get_seconds(); shp->shm_atim = ktime_get_real_seconds();
shp->shm_lprid = task_tgid_vnr(current); shp->shm_lprid = task_tgid_vnr(current);
shp->shm_nattch++; shp->shm_nattch++;
shm_unlock(shp); shm_unlock(shp);
@ -287,7 +287,7 @@ static void shm_close(struct vm_area_struct *vma)
goto done; /* no-op */ goto done; /* no-op */
shp->shm_lprid = task_tgid_vnr(current); shp->shm_lprid = task_tgid_vnr(current);
shp->shm_dtim = get_seconds(); shp->shm_dtim = ktime_get_real_seconds();
shp->shm_nattch--; shp->shm_nattch--;
if (shm_may_destroy(ns, shp)) if (shm_may_destroy(ns, shp))
shm_destroy(ns, shp); shm_destroy(ns, shp);
@ -592,7 +592,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp->shm_cprid = task_tgid_vnr(current); shp->shm_cprid = task_tgid_vnr(current);
shp->shm_lprid = 0; shp->shm_lprid = 0;
shp->shm_atim = shp->shm_dtim = 0; shp->shm_atim = shp->shm_dtim = 0;
shp->shm_ctim = get_seconds(); shp->shm_ctim = ktime_get_real_seconds();
shp->shm_segsz = size; shp->shm_segsz = size;
shp->shm_nattch = 0; shp->shm_nattch = 0;
shp->shm_file = file; shp->shm_file = file;
@ -846,7 +846,7 @@ static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd,
err = ipc_update_perm(&shmid64->shm_perm, ipcp); err = ipc_update_perm(&shmid64->shm_perm, ipcp);
if (err) if (err)
goto out_unlock0; goto out_unlock0;
shp->shm_ctim = get_seconds(); shp->shm_ctim = ktime_get_real_seconds();
break; break;
default: default:
err = -EINVAL; err = -EINVAL;
@ -1586,7 +1586,7 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
seq_printf(s, seq_printf(s,
"%10d %10d %4o " SIZE_SPEC " %5u %5u " "%10d %10d %4o " SIZE_SPEC " %5u %5u "
"%5lu %5u %5u %5u %5u %10lu %10lu %10lu " "%5lu %5u %5u %5u %5u %10llu %10llu %10llu "
SIZE_SPEC " " SIZE_SPEC "\n", SIZE_SPEC " " SIZE_SPEC "\n",
shp->shm_perm.key, shp->shm_perm.key,
shp->shm_perm.id, shp->shm_perm.id,