[PATCH v2] sched/topology: Use kcalloc() in sched_init_numa()

Qianfeng Rong posted 1 patch 1 month ago
kernel/sched/topology.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
[PATCH v2] sched/topology: Use kcalloc() in sched_init_numa()
Posted by Qianfeng Rong 1 month ago
Replace kzalloc() with kcalloc() in sched_init_numa().  As noted in
the Documentation/process/deprecated.rst, open-coded multiplication
in allocator arguments is discouraged because it can lead to integer
overflow.

Use kcalloc() to gain built-in overflow protection, making memory
allocation safer when calculating allocation size compared to explicit
multiplication. Similarly, use size_add() instead of explicit addition
for 'i + nr_levels + 1' - since the maximum value of nr_levels is 256,
double calls to size_add() are unnecessary.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
---
v2: Remove redundant size_add() calls, as the maximum value of nr_levels
    is 256, and update the commit message accordingly.
---
 kernel/sched/topology.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 977e133bb8a4..239f7c5b8242 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1956,7 +1956,7 @@ void sched_init_numa(int offline_node)
 	 */
 	sched_domains_numa_levels = 0;
 
-	masks = kzalloc(sizeof(void *) * nr_levels, GFP_KERNEL);
+	masks = kcalloc(nr_levels, sizeof(void *), GFP_KERNEL);
 	if (!masks)
 		return;
 
@@ -1965,7 +1965,7 @@ void sched_init_numa(int offline_node)
 	 * CPUs of nodes that are that many hops away from us.
 	 */
 	for (i = 0; i < nr_levels; i++) {
-		masks[i] = kzalloc(nr_node_ids * sizeof(void *), GFP_KERNEL);
+		masks[i] = kcalloc(nr_node_ids, sizeof(void *), GFP_KERNEL);
 		if (!masks[i])
 			return;
 
@@ -1994,8 +1994,8 @@ void sched_init_numa(int offline_node)
 	/* Compute default topology size */
 	for (i = 0; sched_domain_topology[i].mask; i++);
 
-	tl = kzalloc((i + nr_levels + 1) *
-			sizeof(struct sched_domain_topology_level), GFP_KERNEL);
+	tl = kcalloc(size_add(i, nr_levels + 1),
+		     sizeof(struct sched_domain_topology_level), GFP_KERNEL);
 	if (!tl)
 		return;
 
-- 
2.34.1