Commit 58934356 authored Jul 16, 2020 by Muchun Song Committed by Peter Zijlstra Jul 22, 2020

smp: Fix a potential usage of stale nr_cpus



The get_option() maybe return 0, it means that the nr_cpus is
not initialized. Then we will use the stale nr_cpus to initialize
the nr_cpu_ids. So fix it.

Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200716070457.53255-1-songmuchun@bytedance.com

parent 3edecfef

kernel/smp.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -634,8 +634,7 @@ static int __init nrcpus(char *str)
		{
		int nr_cpus;

		get_option(&str, &nr_cpus);
		if (nr_cpus > 0 && nr_cpus < nr_cpu_ids)
		if (get_option(&str, &nr_cpus) && nr_cpus > 0 && nr_cpus < nr_cpu_ids)
		nr_cpu_ids = nr_cpus;

		return 0;

Admin message