Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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

ipc/msg.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

ipc/sem.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}

ipc/shm.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

ipc/util.c

+1 −0
Original line number Diff line number Diff line
@@ -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();