Commit 90627a1e authored by Kees Cook's avatar Kees Cook Committed by Andrew Morton
Browse files

lib/group_cpus: handle const qualifier from clusters allocation type 

In preparation for making the kmalloc family of allocators type aware, we
need to make sure that the returned type from the allocation matches the
type of the variable being assigned.  (Before, the allocator would always
return "void *", which can be implicitly cast to any pointer type.)

The assigned type is "const struct cpumask **", but the returned type,
while matching, is not const qualified.  To get them exactly matching,
just use the dereferenced pointer for the sizeof().

Link: https://lkml.kernel.org/r/20260206222010.work.349-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
Cc: Wangyang Guo <wangyang.guo@intel.com>
Cc: Thomas Gleixner <tglx@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f7a553b8

lib/group_cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int alloc_cluster_groups(unsigned int ncpus, 
		goto no_cluster;



	/* Allocate memory based on cluster number. */

	clusters = kcalloc(ncluster, sizeof(struct cpumask *), GFP_KERNEL);

	clusters = kcalloc(ncluster, sizeof(*clusters), GFP_KERNEL);

	if (!clusters)

		goto no_cluster;

	cluster_groups = kcalloc(ncluster, sizeof(struct node_groups), GFP_KERNEL);