The patch titled
Subject: ipc/msg: remove special msg_alloc/free
has been removed from the -mm tree. Its filename was
ipc-msg-remove-special-msg_alloc-free.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: ipc/msg: remove special msg_alloc/free
There is nothing special about the msg_alloc/free routines any more,
so remove them to make code more readable.
[manfred@xxxxxxxxxxxxxxxx: Rediff to keep rcu protection for security_msg_queue_alloc()]
Link: http://lkml.kernel.org/r/20170525185107.12869-19-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/msg.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff -puN ipc/msg.c~ipc-msg-remove-special-msg_alloc-free ipc/msg.c
--- a/ipc/msg.c~ipc-msg-remove-special-msg_alloc-free
+++ a/ipc/msg.c
@@ -95,29 +95,13 @@ static inline void msg_rmid(struct ipc_n
ipc_rmid(&msg_ids(ns), &s->q_perm);
}
-static void __msg_free(struct msg_queue *msq)
-{
- kvfree(msq);
-}
-
static void msg_rcu_free(struct rcu_head *head)
{
struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu);
struct msg_queue *msq = container_of(p, struct msg_queue, q_perm);
security_msg_queue_free(msq);
- __msg_free(msq);
-}
-
-static struct msg_queue *msg_alloc(void)
-{
- struct msg_queue *msq;
-
- msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
- if (unlikely(!msq))
- return NULL;
-
- return msq;
+ kvfree(msq);
}
/**
@@ -134,8 +118,8 @@ static int newque(struct ipc_namespace *
key_t key = params->key;
int msgflg = params->flg;
- msq = msg_alloc();
- if (!msq)
+ msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
+ if (unlikely(!msq))
return -ENOMEM;
msq->q_perm.mode = msgflg & S_IRWXUGO;
@@ -144,7 +128,7 @@ static int newque(struct ipc_namespace *
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
if (retval) {
- __msg_free(msq);
+ kvfree(msq);
return retval;
}
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
--
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
