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

diff --git a/ipc/msg.c b/ipc/msg.c
index cd90bfde89a4625c00ff1e4598267af3a253e93c..770342e1d3274d9206778bd0d83df942fd50a6a1 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -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;
 }
 

diff --git a/ipc/sem.c b/ipc/sem.c
index 2b2ed56e0fde246cd16c1022b05adb694476ee9f..5f137738819d79f06e7291588c6df2fd89c71260 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -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;
 }

diff --git a/ipc/shm.c b/ipc/shm.c
index c5976d318ed172dd7f998986a1696849f588ccb1..d1988ef821a177a6064ade612c920919a0983186 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -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;
 }
 

diff --git a/ipc/util.c b/ipc/util.c
index 2428dd44ca979fd99941793946836e1e72c56998..1a2cb02467ab5f33f309a4542620cbec8d18361a 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -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();