]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
lib/group_cpus: handle const qualifier from clusters allocation type
authorKees Cook <kees@kernel.org>
Fri, 6 Feb 2026 22:20:13 +0000 (14:20 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 12 Feb 2026 23:45:58 +0000 (15:45 -0800)
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>
lib/group_cpus.c

index a93df70919dfbc823e5544bbecf798c9a1e5ee82..d496c5001961e54584e63870260a8b82cdcb0ad6 100644 (file)
@@ -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);