mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-04 04:02:26 +00:00
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.com Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Manfred Spraul <manfred@colorfullife.com> Cc: Davidlohr Bueso <dave@stgolabs.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
51c23b7b7d
commit
3d3653f973
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user