Commit e562aebc authored by Tony Battersby's avatar Tony Battersby Committed by Linus Torvalds
Browse files

ipc: make shm_get_stat() more robust

shm_get_stat() assumes idr_find(&shm_ids(ns).ipcs_idr) returns "struct
shmid_kernel *"; all other callers assume that it returns "struct
kern_ipc_perm *".  This works because "struct kern_ipc_perm" is currently
the first member of "struct shmid_kernel", but it would be better to use
container_of() to prevent future breakage.
Signed-off-by: default avatarTony Battersby <>
Cc: Jiri Olsa <>
Cc: Jiri Kosina <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 40e8a10d
......@@ -555,12 +555,14 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
in_use = shm_ids(ns).in_use;
for (total = 0, next_id = 0; total < in_use; next_id++) {
struct kern_ipc_perm *ipc;
struct shmid_kernel *shp;
struct inode *inode;
shp = idr_find(&shm_ids(ns).ipcs_idr, next_id);
if (shp == NULL)
ipc = idr_find(&shm_ids(ns).ipcs_idr, next_id);
if (ipc == NULL)
shp = container_of(ipc, struct shmid_kernel, shm_perm);
inode = shp->shm_file->f_path.dentry->d_inode;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment