summaryrefslogtreecommitdiff
path: root/ipc/shm.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-12 14:35:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-12 16:26:02 -0700
commit3d3653f9732c73feb8c4addfc1cbdaa292a399fa (patch)
tree325411c382f3be2925f8718591c503d41fea7943 /ipc/shm.c
parent51c23b7b7db52493d4fc869cec8c3e8fe27bfcd3 (diff)
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>
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index c5976d318ed1..d1988ef821a1 100644
--- 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;
}