Skip to content

Commit 90627a1

Browse files
keesakpm00
authored andcommitted
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: Kees Cook <kees@kernel.org> Cc: Wangyang Guo <wangyang.guo@intel.com> Cc: Thomas Gleixner <tglx@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent f7a553b commit 90627a1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/group_cpus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int alloc_cluster_groups(unsigned int ncpus,
320320
goto no_cluster;
321321

322322
/* Allocate memory based on cluster number. */
323-
clusters = kcalloc(ncluster, sizeof(struct cpumask *), GFP_KERNEL);
323+
clusters = kcalloc(ncluster, sizeof(*clusters), GFP_KERNEL);
324324
if (!clusters)
325325
goto no_cluster;
326326
cluster_groups = kcalloc(ncluster, sizeof(struct node_groups), GFP_KERNEL);

0 commit comments

Comments
 (0)