Commit 66470b18 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

ipc/shm: do not use ipc_rcu_free()

Avoid using ipc_rcu_free, since it just re-finds the original structure
pointer.  For the pre-list-init failure path, there is no RCU needed,
since it was just allocated.  It can be directly freed.

Link: default avatarKees Cook <>
Signed-off-by: default avatarManfred Spraul <>
Cc: Davidlohr Bueso <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 1b4654ef
......@@ -172,6 +172,11 @@ static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)
static void __shm_free(struct shmid_kernel *shp)
static void shm_rcu_free(struct rcu_head *head)
struct kern_ipc_perm *ptr = container_of(head, struct kern_ipc_perm,
......@@ -179,7 +184,7 @@ static void shm_rcu_free(struct rcu_head *head)
struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel,
static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
......@@ -557,7 +562,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp-> = NULL;
error = security_shm_alloc(shp);
if (error) {
ipc_rcu_putref(&shp->shm_perm, ipc_rcu_free);
return error;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment