Commit 3d3653f9 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

ipc: move atomic_set() to where it is needed

Only after ipc_addid() has succeeded will refcounting be used, so move
initialization into ipc_addid() and remove from open-coded *_alloc()
routines.

Link: http://lkml.kernel.org/r/20170525185107.12869-17-manfred@colorfullife.comSigned-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarManfred Spraul <manfred@colorfullife.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 51c23b7b
......@@ -117,8 +117,6 @@ static struct msg_queue *msg_alloc(void)
if (unlikely(!msq))
return NULL;
atomic_set(&msq->q_perm.refcount, 1);
return msq;
}
......
......@@ -465,7 +465,6 @@ static struct sem_array *sem_alloc(size_t nsems)
return NULL;
memset(sma, 0, size);
atomic_set(&sma->sem_perm.refcount, 1);
return sma;
}
......
......@@ -526,8 +526,6 @@ static struct shmid_kernel *shm_alloc(void)
if (unlikely(!shp))
return NULL;
atomic_set(&shp->shm_perm.refcount, 1);
return shp;
}
......
......@@ -232,6 +232,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
idr_preload(GFP_KERNEL);
atomic_set(&new->refcount, 1);
spin_lock_init(&new->lock);
new->deleted = false;
rcu_read_lock();
......
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