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/[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/shm.c b/ipc/shm.c
index 566c1e193ee13ede1ae80a78f2f9a991af439f01..2ac489ef56e4e814f8df7428d624b2a523cd8fbc 100644 (file)
--- 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;