The patch titled
Subject: ipc/shm: remove special shm_alloc/free
has been added to the -mm tree. Its filename is
ipc-shm-remove-special-shm_alloc-free.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ipc-shm-remove-special-shm_alloc-free.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ipc-shm-remove-special-shm_alloc-free.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: ipc/shm: remove special shm_alloc/free
There is nothing special about the shm_alloc/free routines any more, so
remove them to make code more readable.
[manfred@xxxxxxxxxxxxxxxx: 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@xxxxxxxxxxxxxxxx
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/shm.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff -puN ipc/shm.c~ipc-shm-remove-special-shm_alloc-free ipc/shm.c
--- a/ipc/shm.c~ipc-shm-remove-special-shm_alloc-free
+++ a/ipc/shm.c
@@ -172,11 +172,6 @@ static inline void shm_lock_by_ptr(struc
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,
@@ -184,7 +179,7 @@ static void shm_rcu_free(struct rcu_head
struct shmid_kernel *shp = container_of(ptr, struct shmid_kernel,
shm_perm);
security_shm_free(shp);
- __shm_free(shp);
+ kvfree(shp);
}
static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
@@ -518,17 +513,6 @@ static const struct vm_operations_struct
#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
* @ns: namespace
@@ -558,8 +542,8 @@ static int newseg(struct ipc_namespace *
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;
@@ -569,7 +553,7 @@ static int newseg(struct ipc_namespace *
shp->shm_perm.security = NULL;
error = security_shm_alloc(shp);
if (error) {
- __shm_free(shp);
+ kvfree(shp);
return error;
}
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
ipc-drop-non-rcu-allocation.patch
ipc-sem-do-not-use-ipc_rcu_free.patch
ipc-shm-do-not-use-ipc_rcu_free.patch
ipc-msg-do-not-use-ipc_rcu_free.patch
ipc-util-drop-ipc_rcu_free.patch
ipc-sem-avoid-ipc_rcu_alloc.patch
ipc-shm-avoid-ipc_rcu_alloc.patch
ipc-msg-avoid-ipc_rcu_alloc.patch
ipc-util-drop-ipc_rcu_alloc.patch
ipc-move-atomic_set-to-where-it-is-needed.patch
ipc-shm-remove-special-shm_alloc-free.patch
ipc-msg-remove-special-msg_alloc-free.patch
ipc-sem-drop-__sem_free.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
