Merge tag 'kmalloc_obj-treewide-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull kmalloc_obj conversion from Kees Cook:
 "This does the tree-wide conversion to kmalloc_obj() and friends using
  coccinelle, with a subsequent small manual cleanup of whitespace
  alignment that coccinelle does not handle.

  This uncovered a clang bug in __builtin_counted_by_ref(), so the
  conversion is preceded by disabling that for current versions of
  clang.  The imminent clang 22.1 release has the fix.

  I've done allmodconfig build tests for x86_64, arm64, i386, and arm. I
  did defconfig builds for alpha, m68k, mips, parisc, powerpc, riscv,
  s390, sparc, sh, arc, csky, xtensa, hexagon, and openrisc"

* tag 'kmalloc_obj-treewide-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kmalloc_obj: Clean up after treewide replacements
  treewide: Replace kmalloc with kmalloc_obj for non-scalar types
  compiler_types: Disable __builtin_counted_by_ref for Clang

5 files changed, 6 insertions, 6 deletions

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 91a24b5e0b93..453d6e18851b 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -159,7 +159,7 @@ int tc_action_net_init(struct net *net, struct tc_action_net *tn,
 {
 	int err = 0;
 
-	tn->idrinfo = kmalloc(sizeof(*tn->idrinfo), GFP_KERNEL);
+	tn->idrinfo = kmalloc_obj(*tn->idrinfo, GFP_KERNEL);
 	if (!tn->idrinfo)
 		return -ENOMEM;
 	tn->ops = ops;
diff --git a/include/net/fq_impl.h b/include/net/fq_impl.h
index 9467e33dfb36..171ee6f7aa83 100644
--- a/include/net/fq_impl.h
+++ b/include/net/fq_impl.h
@@ -358,7 +358,7 @@ static int fq_init(struct fq *fq, int flows_cnt)
 	fq->limit = 8192;
 	fq->memory_limit = 16 << 20; /* 16 MBytes */
 
-	fq->flows = kvcalloc(fq->flows_cnt, sizeof(fq->flows[0]), GFP_KERNEL);
+	fq->flows = kvzalloc_objs(fq->flows[0], fq->flows_cnt, GFP_KERNEL);
 	if (!fq->flows)
 		return -ENOMEM;
 
diff --git a/include/net/iucv/iucv.h b/include/net/iucv/iucv.h
index 5606ed6e7084..18f511da9a09 100644
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
@@ -211,7 +211,7 @@ static inline struct iucv_path *iucv_path_alloc(u16 msglim, u8 flags, gfp_t gfp)
 {
 	struct iucv_path *path;
 
-	path = kzalloc(sizeof(struct iucv_path), gfp);
+	path = kzalloc_obj(struct iucv_path, gfp);
 	if (path) {
 		path->msglim = msglim;
 		path->flags = flags;
diff --git a/include/net/tc_act/tc_gate.h b/include/net/tc_act/tc_gate.h
index c1a67149c6b6..b147a3bb1a46 100644
--- a/include/net/tc_act/tc_gate.h
+++ b/include/net/tc_act/tc_gate.h
@@ -114,7 +114,7 @@ static inline struct action_gate_entry
 	if (i != num_entries)
 		return NULL;
 
-	oe = kcalloc(num_entries, sizeof(*oe), GFP_ATOMIC);
+	oe = kzalloc_objs(*oe, num_entries, GFP_ATOMIC);
 	if (!oe)
 		return NULL;
 
diff --git a/include/net/udp.h b/include/net/udp.h
index 700dbedcb15f..24491111477a 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -294,8 +294,8 @@ static inline int udp_lib_init_sock(struct sock *sk)
 	up->forward_threshold = sk->sk_rcvbuf >> 2;
 	set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags);
 
-	up->udp_prod_queue = kcalloc(nr_node_ids, sizeof(*up->udp_prod_queue),
-				     GFP_KERNEL);
+	up->udp_prod_queue = kzalloc_objs(*up->udp_prod_queue, nr_node_ids,
+					  GFP_KERNEL);
 	if (!up->udp_prod_queue)
 		return -ENOMEM;
 	for (int i = 0; i < nr_node_ids; i++)