From 3e0c24042e5aa55eee817caeca67246df69931e1 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 12 Jul 2017 14:35:05 -0700 Subject: ipc/shm: avoid ipc_rcu_alloc() Instead of using ipc_rcu_alloc() which only performs the refcount bump, open code it. This also allows for shmid_kernel structure layout to be randomized in the future. Link: http://lkml.kernel.org/r/20170525185107.12869-11-manfred@colorfullife.com Signed-off-by: Kees Cook Signed-off-by: Manfred Spraul Cc: Davidlohr Bueso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- ipc/shm.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'ipc/shm.c') diff --git a/ipc/shm.c b/ipc/shm.c index 566c1e193ee1..2ac489ef56e4 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -518,6 +518,19 @@ static const struct vm_operations_struct shm_vm_ops = { #endif }; +static struct shmid_kernel *shm_alloc(void) +{ + struct shmid_kernel *shp; + + shp = kvmalloc(sizeof(*shp), GFP_KERNEL); + if (unlikely(!shp)) + return NULL; + + atomic_set(&shp->shm_perm.refcount, 1); + + return shp; +} + /** * newseg - Create a new shared memory segment * @ns: namespace @@ -548,10 +561,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) ns->shm_tot + numpages > ns->shm_ctlall) return -ENOSPC; - BUILD_BUG_ON(offsetof(struct shmid_kernel, shm_perm) != 0); - - shp = container_of(ipc_rcu_alloc(sizeof(*shp)), struct shmid_kernel, - shm_perm); + shp = shm_alloc(); if (!shp) return -ENOMEM; -- cgit v1.2.3-58-ga151