|
@@ -57,8 +57,8 @@ struct shmid_kernel /* private to the kernel */
|
|
time64_t shm_atim;
|
|
time64_t shm_atim;
|
|
time64_t shm_dtim;
|
|
time64_t shm_dtim;
|
|
time64_t shm_ctim;
|
|
time64_t shm_ctim;
|
|
- pid_t shm_cprid;
|
|
|
|
- pid_t shm_lprid;
|
|
|
|
|
|
+ struct pid *shm_cprid;
|
|
|
|
+ struct pid *shm_lprid;
|
|
struct user_struct *mlock_user;
|
|
struct user_struct *mlock_user;
|
|
|
|
|
|
/* The task created the shm object. NULL if the task is dead. */
|
|
/* The task created the shm object. NULL if the task is dead. */
|
|
@@ -226,7 +226,7 @@ static int __shm_open(struct vm_area_struct *vma)
|
|
return PTR_ERR(shp);
|
|
return PTR_ERR(shp);
|
|
|
|
|
|
shp->shm_atim = ktime_get_real_seconds();
|
|
shp->shm_atim = ktime_get_real_seconds();
|
|
- shp->shm_lprid = task_tgid_vnr(current);
|
|
|
|
|
|
+ ipc_update_pid(&shp->shm_lprid, task_tgid(current));
|
|
shp->shm_nattch++;
|
|
shp->shm_nattch++;
|
|
shm_unlock(shp);
|
|
shm_unlock(shp);
|
|
return 0;
|
|
return 0;
|
|
@@ -267,6 +267,8 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
|
|
user_shm_unlock(i_size_read(file_inode(shm_file)),
|
|
user_shm_unlock(i_size_read(file_inode(shm_file)),
|
|
shp->mlock_user);
|
|
shp->mlock_user);
|
|
fput(shm_file);
|
|
fput(shm_file);
|
|
|
|
+ ipc_update_pid(&shp->shm_cprid, NULL);
|
|
|
|
+ ipc_update_pid(&shp->shm_lprid, NULL);
|
|
ipc_rcu_putref(&shp->shm_perm, shm_rcu_free);
|
|
ipc_rcu_putref(&shp->shm_perm, shm_rcu_free);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -311,7 +313,7 @@ static void shm_close(struct vm_area_struct *vma)
|
|
if (WARN_ON_ONCE(IS_ERR(shp)))
|
|
if (WARN_ON_ONCE(IS_ERR(shp)))
|
|
goto done; /* no-op */
|
|
goto done; /* no-op */
|
|
|
|
|
|
- shp->shm_lprid = task_tgid_vnr(current);
|
|
|
|
|
|
+ ipc_update_pid(&shp->shm_lprid, task_tgid(current));
|
|
shp->shm_dtim = ktime_get_real_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))
|
|
@@ -614,8 +616,8 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
|
|
if (IS_ERR(file))
|
|
if (IS_ERR(file))
|
|
goto no_file;
|
|
goto no_file;
|
|
|
|
|
|
- shp->shm_cprid = task_tgid_vnr(current);
|
|
|
|
- shp->shm_lprid = 0;
|
|
|
|
|
|
+ shp->shm_cprid = get_pid(task_tgid(current));
|
|
|
|
+ shp->shm_lprid = NULL;
|
|
shp->shm_atim = shp->shm_dtim = 0;
|
|
shp->shm_atim = shp->shm_dtim = 0;
|
|
shp->shm_ctim = ktime_get_real_seconds();
|
|
shp->shm_ctim = ktime_get_real_seconds();
|
|
shp->shm_segsz = size;
|
|
shp->shm_segsz = size;
|
|
@@ -648,6 +650,8 @@ no_id:
|
|
user_shm_unlock(size, shp->mlock_user);
|
|
user_shm_unlock(size, shp->mlock_user);
|
|
fput(file);
|
|
fput(file);
|
|
no_file:
|
|
no_file:
|
|
|
|
+ ipc_update_pid(&shp->shm_cprid, NULL);
|
|
|
|
+ ipc_update_pid(&shp->shm_lprid, NULL);
|
|
call_rcu(&shp->shm_perm.rcu, shm_rcu_free);
|
|
call_rcu(&shp->shm_perm.rcu, shm_rcu_free);
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
@@ -970,8 +974,8 @@ static int shmctl_stat(struct ipc_namespace *ns, int shmid,
|
|
tbuf->shm_atime = shp->shm_atim;
|
|
tbuf->shm_atime = shp->shm_atim;
|
|
tbuf->shm_dtime = shp->shm_dtim;
|
|
tbuf->shm_dtime = shp->shm_dtim;
|
|
tbuf->shm_ctime = shp->shm_ctim;
|
|
tbuf->shm_ctime = shp->shm_ctim;
|
|
- tbuf->shm_cpid = shp->shm_cprid;
|
|
|
|
- tbuf->shm_lpid = shp->shm_lprid;
|
|
|
|
|
|
+ tbuf->shm_cpid = pid_vnr(shp->shm_cprid);
|
|
|
|
+ tbuf->shm_lpid = pid_vnr(shp->shm_lprid);
|
|
tbuf->shm_nattch = shp->shm_nattch;
|
|
tbuf->shm_nattch = shp->shm_nattch;
|
|
|
|
|
|
ipc_unlock_object(&shp->shm_perm);
|
|
ipc_unlock_object(&shp->shm_perm);
|
|
@@ -1605,6 +1609,7 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
|
|
#ifdef CONFIG_PROC_FS
|
|
#ifdef CONFIG_PROC_FS
|
|
static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
|
|
static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
|
|
{
|
|
{
|
|
|
|
+ struct pid_namespace *pid_ns = ipc_seq_pid_ns(s);
|
|
struct user_namespace *user_ns = seq_user_ns(s);
|
|
struct user_namespace *user_ns = seq_user_ns(s);
|
|
struct kern_ipc_perm *ipcp = it;
|
|
struct kern_ipc_perm *ipcp = it;
|
|
struct shmid_kernel *shp;
|
|
struct shmid_kernel *shp;
|
|
@@ -1627,8 +1632,8 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
|
|
shp->shm_perm.id,
|
|
shp->shm_perm.id,
|
|
shp->shm_perm.mode,
|
|
shp->shm_perm.mode,
|
|
shp->shm_segsz,
|
|
shp->shm_segsz,
|
|
- shp->shm_cprid,
|
|
|
|
- shp->shm_lprid,
|
|
|
|
|
|
+ pid_nr_ns(shp->shm_cprid, pid_ns),
|
|
|
|
+ pid_nr_ns(shp->shm_lprid, pid_ns),
|
|
shp->shm_nattch,
|
|
shp->shm_nattch,
|
|
from_kuid_munged(user_ns, shp->shm_perm.uid),
|
|
from_kuid_munged(user_ns, shp->shm_perm.uid),
|
|
from_kgid_munged(user_ns, shp->shm_perm.gid),
|
|
from_kgid_munged(user_ns, shp->shm_perm.gid),
|