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/[email protected]
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Manfred Spraul <[email protected]>
Cc: Davidlohr Bueso <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Kees Cook 2017-07-12 14:35:22 -07:00 • committed by Linus Torvalds
commit 3d3653f973
4 changed files with 1 additions and 5 deletions

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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;
}

View file

@ -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();