There is nothing special about the shm_alloc/free routines any more, so
remove them to make code more readable.
[manfred@colorfullife.com: Rediff, to continue to keep rcu for free calls after a successful security_shm_alloc()]
Link: http://lkml.kernel.org/r/20170525185107.12869-18-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>
ipc_lock_object(&ipcp->shm_perm);
}
ipc_lock_object(&ipcp->shm_perm);
}
-static void __shm_free(struct shmid_kernel *shp)
-{
- kvfree(shp);
-}
-
static void shm_rcu_free(struct rcu_head *head)
{
struct kern_ipc_perm *ptr = container_of(head, struct kern_ipc_perm,
static void shm_rcu_free(struct rcu_head *head)
{
struct kern_ipc_perm *ptr = container_of(head, struct kern_ipc_perm,
struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel,
shm_perm);
security_shm_free(shp);
struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel,
shm_perm);
security_shm_free(shp);
}
static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
}
static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
-static struct shmid_kernel *shm_alloc(void)
-{
- struct shmid_kernel *shp;
-
- shp = kvmalloc(sizeof(*shp), GFP_KERNEL);
- if (unlikely(!shp))
- return NULL;
-
- return shp;
-}
-
/**
* newseg - Create a new shared memory segment
* @ns: namespace
/**
* newseg - Create a new shared memory segment
* @ns: namespace
ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
- shp = shm_alloc();
- if (!shp)
+ shp = kvmalloc(sizeof(*shp), GFP_KERNEL);
+ if (unlikely(!shp))
return -ENOMEM;
shp->shm_perm.key = key;
return -ENOMEM;
shp->shm_perm.key = key;
shp->shm_perm.security = NULL;
error = security_shm_alloc(shp);
if (error) {
shp->shm_perm.security = NULL;
error = security_shm_alloc(shp);
if (error) {