]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rtla: Fix parse_cpu_set() bug introduced by strtoi()
authorCosta Shulyupin <costa.shul@redhat.com>
Mon, 12 Jan 2026 19:26:41 +0000 (21:26 +0200)
committerTomas Glozar <tglozar@redhat.com>
Tue, 13 Jan 2026 07:32:52 +0000 (08:32 +0100)
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: 7e9dfccf8f11 ("rtla: Replace atoi() with a robust strtoi()")
Signed-off-by: Costa Shulyupin <costa.shul@redhat.com>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20260112192642.212848-2-costa.shul@redhat.com
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
tools/tracing/rtla/src/utils.c

index 18986a5aed3c128b389845cfa3a4bd026c91ba48..0da3b2470c31797613407f9e8f7ab4f5c4da3381 100644 (file)
@@ -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++;