treewide: Replace kmalloc with kmalloc_obj for non-scalar types

This is the result of running the Coccinelle script from
scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to
avoid scalar types (which need careful case-by-case checking), and
instead replace kmalloc-family calls that allocate struct or union
object instances:

Single allocations:	kmalloc(sizeof(TYPE), ...)
are replaced with:	kmalloc_obj(TYPE, ...)

Array allocations:	kmalloc_array(COUNT, sizeof(TYPE), ...)
are replaced with:	kmalloc_objs(TYPE, COUNT, ...)

Flex array allocations:	kmalloc(struct_size(PTR, FAM, COUNT), ...)
are replaced with:	kmalloc_flex(*PTR, FAM, COUNT, ...)

(where TYPE may also be *VAR)

The resulting allocations no longer return "void *", instead returning
"TYPE *".

Signed-off-by: Kees Cook <kees@kernel.org>

6 files changed, 13 insertions, 13 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index bb7c9e5d2b90..a90aa6803f1b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -210,7 +210,7 @@ static int msg_insert(struct msg_msg *msg, struct mqueue_inode_info *info)
 		leaf = info->node_cache;
 		info->node_cache = NULL;
 	} else {
-		leaf = kmalloc(sizeof(*leaf), GFP_ATOMIC);
+		leaf = kmalloc_obj(*leaf, GFP_ATOMIC);
 		if (!leaf)
 			return -ENOMEM;
 		INIT_LIST_HEAD(&leaf->msg_list);
@@ -449,7 +449,7 @@ static int mqueue_init_fs_context(struct fs_context *fc)
 {
 	struct mqueue_fs_context *ctx;
 
-	ctx = kzalloc(sizeof(struct mqueue_fs_context), GFP_KERNEL);
+	ctx = kzalloc_obj(struct mqueue_fs_context, GFP_KERNEL);
 	if (!ctx)
 		return -ENOMEM;
 
@@ -1088,7 +1088,7 @@ static int do_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
 	 * fall back to that if necessary.
 	 */
 	if (!info->node_cache)
-		new_leaf = kmalloc(sizeof(*new_leaf), GFP_KERNEL);
+		new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
 
 	spin_lock(&info->lock);
 
@@ -1181,7 +1181,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
 	 * fall back to that if necessary.
 	 */
 	if (!info->node_cache)
-		new_leaf = kmalloc(sizeof(*new_leaf), GFP_KERNEL);
+		new_leaf = kmalloc_obj(*new_leaf, GFP_KERNEL);
 
 	spin_lock(&info->lock);
 
diff --git a/ipc/msg.c b/ipc/msg.c
index ee6af4fe52bf..62996b97f0ac 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -148,7 +148,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
 	key_t key = params->key;
 	int msgflg = params->flg;
 
-	msq = kmalloc(sizeof(*msq), GFP_KERNEL_ACCOUNT);
+	msq = kmalloc_obj(*msq, GFP_KERNEL_ACCOUNT);
 	if (unlikely(!msq))
 		return -ENOMEM;
 
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 535f16ea40e1..1e71353bdb4a 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -58,7 +58,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
 	}
 
 	err = -ENOMEM;
-	ns = kzalloc(sizeof(struct ipc_namespace), GFP_KERNEL_ACCOUNT);
+	ns = kzalloc_obj(struct ipc_namespace, GFP_KERNEL_ACCOUNT);
 	if (ns == NULL)
 		goto fail_dec;
 
diff --git a/ipc/sem.c b/ipc/sem.c
index 0f06e4bd4673..2a19244cff22 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -514,7 +514,7 @@ static struct sem_array *sem_alloc(size_t nsems)
 	if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0]))
 		return NULL;
 
-	sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL_ACCOUNT);
+	sma = kvzalloc_flex(*sma, sems, nsems, GFP_KERNEL_ACCOUNT);
 	if (unlikely(!sma))
 		return NULL;
 
@@ -1853,7 +1853,7 @@ static inline int get_undo_list(struct sem_undo_list **undo_listp)
 
 	undo_list = current->sysvsem.undo_list;
 	if (!undo_list) {
-		undo_list = kzalloc(sizeof(*undo_list), GFP_KERNEL_ACCOUNT);
+		undo_list = kzalloc_obj(*undo_list, GFP_KERNEL_ACCOUNT);
 		if (undo_list == NULL)
 			return -ENOMEM;
 		spin_lock_init(&undo_list->lock);
@@ -1938,7 +1938,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
 	rcu_read_unlock();
 
 	/* step 2: allocate new undo structure */
-	new = kvzalloc(struct_size(new, semadj, nsems), GFP_KERNEL_ACCOUNT);
+	new = kvzalloc_flex(*new, semadj, nsems, GFP_KERNEL_ACCOUNT);
 	if (!new) {
 		ipc_rcu_putref(&sma->sem_perm, sem_rcu_free);
 		return ERR_PTR(-ENOMEM);
@@ -2234,7 +2234,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops,
 		return -EINVAL;
 
 	if (nsops > SEMOPM_FAST) {
-		sops = kvmalloc_array(nsops, sizeof(*sops), GFP_KERNEL);
+		sops = kvmalloc_objs(*sops, nsops, GFP_KERNEL);
 		if (sops == NULL)
 			return -ENOMEM;
 	}
diff --git a/ipc/shm.c b/ipc/shm.c
index e8c7d1924c50..b94248570304 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -722,7 +722,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
 			ns->shm_tot + numpages > ns->shm_ctlall)
 		return -ENOSPC;
 
-	shp = kmalloc(sizeof(*shp), GFP_KERNEL_ACCOUNT);
+	shp = kmalloc_obj(*shp, GFP_KERNEL_ACCOUNT);
 	if (unlikely(!shp))
 		return -ENOMEM;
 
@@ -1618,7 +1618,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
 	rcu_read_unlock();
 
 	err = -ENOMEM;
-	sfd = kzalloc(sizeof(*sfd), GFP_KERNEL);
+	sfd = kzalloc_obj(*sfd, GFP_KERNEL);
 	if (!sfd) {
 		fput(base);
 		goto out_nattch;
diff --git a/ipc/util.c b/ipc/util.c
index cae60f11d9c2..59235ffba0d9 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -141,7 +141,7 @@ void __init ipc_init_proc_interface(const char *path, const char *header,
 	struct proc_dir_entry *pde;
 	struct ipc_proc_iface *iface;
 
-	iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+	iface = kmalloc_obj(*iface, GFP_KERNEL);
 	if (!iface)
 		return;
 	iface->path	= path;