Commit 6ea8a206 authored by Costa Shulyupin's avatar Costa Shulyupin Committed by Tomas Glozar
Browse files

rtla: Fix parse_cpu_set() bug introduced by strtoi() 



The patch 'Replace atoi() with a robust strtoi()' introduced a bug
in parse_cpu_set(), which relies on partial parsing of the input string.

The function parses CPU specifications like '0-3,5' by incrementing
a pointer through the string. strtoi() rejects strings with trailing
characters, causing parse_cpu_set() to fail on any CPU list with
multiple entries.

Restore the original use of atoi() in parse_cpu_set().

Fixes: 7e9dfccf ("rtla: Replace atoi() with a robust strtoi()")
Signed-off-by: default avatarCosta Shulyupin <costa.shul@redhat.com>
Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20260112192642.212848-2-costa.shul@redhat.com


Signed-off-by: default avatarTomas Glozar <tglozar@redhat.com>
parent fb8b8183

tools/tracing/rtla/src/utils.c

+4 −6
Original line number Diff line number Diff line
@@ -128,18 +128,16 @@ int parse_cpu_set(char *cpu_list, cpu_set_t *set) 
	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);



	for (p = cpu_list; *p; ) {

		if (strtoi(p, &cpu))

			goto err;

		if (cpu < 0 || cpu >= nr_cpus)

		cpu = atoi(p);

		if (cpu < 0 || (!cpu && *p != '0') || cpu >= nr_cpus)

			goto err;



		while (isdigit(*p))

			p++;

		if (*p == '-') {

			p++;

			if (strtoi(p, &end_cpu))

				goto err;

			if (end_cpu < cpu || end_cpu >= nr_cpus)

			end_cpu = atoi(p);

			if (end_cpu < cpu || (!end_cpu && *p != '0') || end_cpu >= nr_cpus)

				goto err;

			while (isdigit(*p))

				p++;