leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipc/shm: remove special shm_alloc/free

Browse Source 
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>
This commit is contained in:
Kees Cook 2017-07-12 14:35:25 -07:00 committed by Linus Torvalds
parent 3d3653f973
commit 42e618f77d
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipc/shm.c
View File

@ -172,11 +172,6 @@ static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)
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) static void shm_rcu_free(struct rcu_head *head)
{ {
struct kern_ipc_perm *ptr = container_of(head, struct kern_ipc_perm, struct kern_ipc_perm *ptr = container_of(head, struct kern_ipc_perm,
@ -184,7 +179,7 @@ static void shm_rcu_free(struct rcu_head *head)
struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel, struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel,
shm_perm); shm_perm);
security_shm_free(shp); security_shm_free(shp);
__shm_free(shp); kvfree(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)
@ -518,17 +513,6 @@ static const struct vm_operations_struct shm_vm_ops = {
#endif #endif
}; };
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 * newseg - Create a new shared memory segment
* @ns: namespace * @ns: namespace
@ -558,8 +542,8 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
ns->shm_tot + numpages > ns->shm_ctlall) ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC; return -ENOSPC;
shp = shm_alloc(); shp = kvmalloc(sizeof(*shp), GFP_KERNEL);
if (!shp) if (unlikely(!shp))
return -ENOMEM; return -ENOMEM;
shp->shm_perm.key = key; shp->shm_perm.key = key;
@ -569,7 +553,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp->shm_perm.security = NULL; shp->shm_perm.security = NULL;
error = security_shm_alloc(shp); error = security_shm_alloc(shp);
if (error) { if (error) {
__shm_free(shp); kvfree(shp);
return error; return error;
} }