Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

libperf cpumap: Be tolerant of newline at the end of a cpumask

File cpumasks often have a newline that shouldn't trigger the invalid
parsing case in perf_cpu_map__new().

Reviewed-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ben Gainey <ben.gainey@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kyle Meyer <kyle.meyer@hpe.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20241206044035.1062032-5-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
5d2fd516 e8399d34

+2 -2
+2 -2
tools/lib/perf/cpumap.c
··· 241 241 p = NULL; 242 242 start_cpu = strtoul(cpu_list, &p, 0); 243 243 if (start_cpu >= INT_MAX 244 - || (*p != '\0' && *p != ',' && *p != '-')) 244 + || (*p != '\0' && *p != ',' && *p != '-' && *p != '\n')) 245 245 goto invalid; 246 246 247 247 if (*p == '-') { ··· 249 249 p = NULL; 250 250 end_cpu = strtoul(cpu_list, &p, 0); 251 251 252 - if (end_cpu >= INT_MAX || (*p != '\0' && *p != ',')) 252 + if (end_cpu >= INT_MAX || (*p != '\0' && *p != ',' && *p != '\n')) 253 253 goto invalid; 254 254 255 255 if (end_cpu < start_cpu)