perf pmu: Replace all non-returning strlcpy with strscpy
PATCH 1/1 perf pmu: Replace all non-returning strlcpy with strscpy
strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy().
No return values were used, so direct replacement is safe.
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89
--- kernel/events/core.c | 6 +++--- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/arch/x86/util/machine.c | 2 +- tools/perf/builtin-buildid-cache.c | 6 +++--- tools/perf/builtin-daemon.c | 4 ++-- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/tests/dlfilter-test.c | 2 +- tools/perf/tests/symbols.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/annotate.c | 4 ++-- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/dso.c | 2 +- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/llvm-utils.c | 4 ++-- tools/perf/util/machine.c | 8 ++++---- tools/perf/util/pmu-hybrid.c | 2 +- tools/perf/util/pmu.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 4 ++-- tools/perf/util/synthetic-events.c | 4 ++-- 21 files changed, 33 insertions(+), 33 deletions(-)
kernel/events/core.c +3 -3
@@ -8245,7 +8245,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)unsigned int size;memset (comm,0 ,sizeof (comm)); -strlcpy (comm, comm_event->task->comm,sizeof (comm)); +strscpy (comm, comm_event->task->comm,sizeof (comm)); size =ALIGN (strlen (comm)+1 ,sizeof (u64)); comm_event->comm = comm;
@@ -8700,7 +8700,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) } cpy_name: -strlcpy (tmp, name,sizeof (tmp)); +strscpy (tmp, name,sizeof (tmp)); name = tmp; got_name:/*
@@ -9124,7 +9124,7 @@ void perf_event_ksymbol(u16 ksym_type, u64 addr, u32 len, bool unregister, ksym_type == PERF_RECORD_KSYMBOL_TYPE_UNKNOWN) goto err; -strlcpy (name, sym,KSYM_NAME_LEN ); +strscpy (name, sym,KSYM_NAME_LEN ); name_len =strlen (name) +1 ;while (!IS_ALIGNED (name_len,sizeof (u64))) name[name_len++] ='\0' ;
tools/perf/arch/x86/util/event.c +1 -1
@@ -64,7 +64,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool, event->mmap.pgoff =map__pgoff (map); event->mmap.pid = machine->pid; -strlcpy (event->mmap.filename, kmap->name,PATH_MAX ); +strscpy (event->mmap.filename, kmap->name,PATH_MAX );if (perf_tool__process_synth_event (tool, event, machine, process) !=0 ) {
tools/perf/arch/x86/util/machine.c +1 -1
@@ -40,7 +40,7 @@ static int add_extra_kernel_map(struct extra_kernel_map_info *mi, u64 start, mi->maps[mi->cnt].start = start; mi->maps[mi->cnt].end = end; mi->maps[mi->cnt].pgoff = pgoff; -strlcpy (mi->maps[mi->cnt].name, name,KMAP_NAME_LEN ); +strscpy (mi->maps[mi->cnt].name, name,KMAP_NAME_LEN ); mi->cnt +=1 ;
tools/perf/builtin-buildid-cache.c +3 -3
@@ -36,7 +36,7 @@ static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)char root_dir[PATH_MAX ];char *p; -strlcpy (root_dir, proc_dir,sizeof (root_dir)); +strscpy (root_dir, proc_dir,sizeof (root_dir)); p =strrchr (root_dir,'/' );if (!p)
@@ -104,7 +104,7 @@ static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir, to_dir, dent->d_name);if (!compare_proc_modules (from, to) &&same_kallsyms_reloc (from_dir, to_subdir)) { -strlcpy (to_dir, to_subdir, to_dir_sz); +strscpy (to_dir, to_subdir, to_dir_sz); ret =0 ;break ; }
@@ -121,7 +121,7 @@ static int build_id_cache__add_kcore(const char *filename, bool force)char from_dir[PATH_MAX ], to_dir[PATH_MAX ];char *p; -strlcpy (from_dir, filename,sizeof (from_dir)); +strscpy (from_dir, filename,sizeof (from_dir)); p =strrchr (from_dir,'/' );if (!p ||strcmp (p +1 ,"kcore" ))
tools/perf/builtin-daemon.c +2 -2
@@ -606,7 +606,7 @@ static int setup_server_socket(struct daemon *daemon)memset (&addr,0 ,sizeof (addr)); addr.sun_family =AF_UNIX ; -strlcpy (addr.sun_path, path,sizeof (addr.sun_path) -1 ); +strscpy (addr.sun_path, path,sizeof (addr.sun_path) -1 );unlink (path);if (bind (fd, (struct sockaddr *)&addr,sizeof (addr)) ==-1 ) {
@@ -877,7 +877,7 @@ static int setup_client_socket(struct daemon *daemon)memset (&addr,0 ,sizeof (addr)); addr.sun_family =AF_UNIX ; -strlcpy (addr.sun_path, path,sizeof (addr.sun_path) -1 ); +strscpy (addr.sun_path, path,sizeof (addr.sun_path) -1 );if (connect (fd, (struct sockaddr *) &addr,sizeof (addr)) ==-1 ) {perror ("failed: connect" );
tools/perf/jvmti/libjvmti.c +1 -1
@@ -158,7 +158,7 @@ copy_class_filename(const char * class_sign, const char * file_name, char * resu result[i] ='\0' ; }else {/* fallback case */ -strlcpy (result, file_name, max_length); +strscpy (result, file_name, max_length); } }
tools/perf/tests/dlfilter-test.c +1 -1
@@ -234,7 +234,7 @@ static int get_dlfilters_path(char *buf, size_t sz)if (access (path,R_OK ))return -1 ; } -strlcpy (buf,dirname (path), sz); +strscpy (buf,dirname (path), sz);return 0 ; }
tools/perf/tests/symbols.c +1 -1
@@ -45,7 +45,7 @@ static void exit_test_info(struct test_info *ti)static void get_test_dso_filename (char *filename,size_t max_sz) {if (dso_to_test) -strlcpy (filename, dso_to_test, max_sz); +strscpy (filename, dso_to_test, max_sz);else perf_exe (filename, max_sz); }
tools/perf/ui/tui/helpline.c +1 -1
@@ -24,7 +24,7 @@ static void tui_helpline__push(const char *msg)SLsmg_set_color (0 );SLsmg_write_nstring ((char *)msg, SLtt_Screen_Cols);SLsmg_refresh (); -strlcpy (ui_helpline__current, msg, sz); +strscpy (ui_helpline__current, msg, sz); }static int tui_helpline__show (const char *format,va_list ap)
tools/perf/util/annotate.c +2 -2
@@ -1702,7 +1702,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t filif (access (filename,R_OK ) && errno ==ENOENT && dso->nsinfo) {char *new_name =dso__filename_with_chroot (dso, filename);if (new_name) { -strlcpy (filename, new_name, filename_size); +strscpy (filename, new_name, filename_size);free (new_name); } }
@@ -2002,7 +2002,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) kce.len = sym->end - sym->start;if (!kcore_extract__create (&kce)) { delete_extract = true; -strlcpy (symfs_filename, kce.extract_filename, +strscpy (symfs_filename, kce.extract_filename,sizeof (symfs_filename)); } }else if (dso__needs_decompress (dso)) {
tools/perf/util/auxtrace.c +1 -1
@@ -1213,7 +1213,7 @@ void auxtrace_synth_guest_error(struct perf_record_auxtrace_error *auxtrace_erro auxtrace_error->fmt =1 ; auxtrace_error->ip = ip; auxtrace_error->time = timestamp; -strlcpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG ); +strscpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG );if (machine_pid) { auxtrace_error->fmt =2 ; auxtrace_error->machine_pid = machine_pid;
tools/perf/util/dso.c +1 -1
@@ -318,7 +318,7 @@ int filename__decompress(const char *name, char *pathname,unlink (tmpbuf);if (pathname && (fd >=0 )) -strlcpy (pathname, tmpbuf, len); +strscpy (pathname, tmpbuf, len);return fd; }
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -1
@@ -507,7 +507,7 @@ int intel_pt__strerror(int code, char *buf, size_t buflen) {if (code <1 || code >=INTEL_PT_ERR_MAX ) code =INTEL_PT_ERR_UNK ; -strlcpy (buf, intel_pt_err_msgs[code], buflen); +strscpy (buf, intel_pt_err_msgs[code], buflen);return 0 ; }
tools/perf/util/llvm-utils.c +2 -2
@@ -80,7 +80,7 @@ search_program(const char *def, const char *name,if (def && def[0 ] !='\0' ) {if (def[0 ] =='/' ) {if (access (def,F_OK ) ==0 ) { -strlcpy (output, def,PATH_MAX ); +strscpy (output, def,PATH_MAX );return 0 ; } }else if (def[0 ] !='\0' )
@@ -99,7 +99,7 @@ search_program(const char *def, const char *name,while (path) {scnprintf (buf,sizeof (buf),"%s/%s" , path, name);if (access (buf,F_OK ) ==0 ) { -strlcpy (output, buf,PATH_MAX ); +strscpy (output, buf,PATH_MAX ); ret =0 ;break ; }
tools/perf/util/machine.c +4 -4
@@ -1223,7 +1223,7 @@ int machine__create_extra_kernel_map(struct machine *machine, kmap =map__kmap (map); -strlcpy (kmap->name, xm->name,KMAP_NAME_LEN ); +strscpy (kmap->name, xm->name,KMAP_NAME_LEN ); err =maps__insert (machine__kernel_maps (machine), map);
@@ -1314,7 +1314,7 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine, .pgoff = pgoff, }; -strlcpy (xm.name,ENTRY_TRAMPOLINE_NAME ,KMAP_NAME_LEN ); +strscpy (xm.name,ENTRY_TRAMPOLINE_NAME ,KMAP_NAME_LEN );if (machine__create_extra_kernel_map (machine, kernel, &xm) <0 )return -1 ;
@@ -1935,7 +1935,7 @@ int machine__process_mmap2_event(struct machine *machine, .pgoff = event->mmap2.pgoff, }; -strlcpy (xm.name, event->mmap2.filename,KMAP_NAME_LEN ); +strscpy (xm.name, event->mmap2.filename,KMAP_NAME_LEN ); ret =machine__process_kernel_mmap_event (machine, &xm, bid);if (ret <0 ) goto out_problem;
@@ -1992,7 +1992,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event .pgoff = event->mmap.pgoff, }; -strlcpy (xm.name, event->mmap.filename,KMAP_NAME_LEN ); +strscpy (xm.name, event->mmap.filename,KMAP_NAME_LEN ); ret =machine__process_kernel_mmap_event (machine, &xm,NULL );if (ret <0 ) goto out_problem;
tools/perf/util/pmu-hybrid.c +1 -1
@@ -27,7 +27,7 @@ bool perf_pmu__hybrid_mounted(const char *name)if (strncmp (name,"cpu_" ,4 ))return false; -strlcpy (pmu_name, name,sizeof (pmu_name)); +strscpy (pmu_name, name,sizeof (pmu_name));return perf_pmu__scan_file (&pmu,"cpus" ,"%u" , &cpu) >0 ; }
tools/perf/util/pmu.c +1 -1
@@ -599,7 +599,7 @@ static struct perf_cpu_map *pmu_cpumask(int dirfd, const char *name)struct perf_pmu pmu = {.name = pmu_name};FILE *file; -strlcpy (pmu_name, name,sizeof (pmu_name)); +strscpy (pmu_name, name,sizeof (pmu_name));for (template = templates; *template; template++) { file =perf_pmu__open_file_at (&pmu, dirfd, *template);if (!file)
tools/perf/util/probe-file.c +1 -1
@@ -459,7 +459,7 @@ static int probe_cache__open(struct probe_cache *pcache, const char *target,if (target &&build_id_cache__cached (target)) {/* This is a cached buildid */ -strlcpy (sbuildid, target,SBUILD_ID_SIZE ); +strscpy (sbuildid, target,SBUILD_ID_SIZE ); dir_name =build_id_cache__linkname (sbuildid,NULL ,0 ); goto found; }
tools/perf/util/svghelper.c +1 -1
@@ -332,7 +332,7 @@ static char *cpu_model(void)if (file) {while (fgets (buf,255 , file)) {if (strstr (buf,"model name" )) { -strlcpy (cpu_m, &buf[13 ],255 ); +strscpy (cpu_m, &buf[13 ],255 );break ; } }
tools/perf/util/symbol.c +2 -2
@@ -1967,7 +1967,7 @@ int dso__load(struct dso *dso, struct map *map)char *new_name =dso__filename_with_chroot (dso, name);if (new_name) { is_reg =is_regular_file (new_name); -strlcpy (name, new_name,PATH_MAX ); +strscpy (name, new_name,PATH_MAX );free (new_name); } }
@@ -2254,7 +2254,7 @@ static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)scnprintf (kallsyms_filename,sizeof (kallsyms_filename),"%s/%s/kallsyms" , dir, nd->s);if (!validate_kcore_addresses (kallsyms_filename, map)) { -strlcpy (dir, kallsyms_filename, dir_sz); +strscpy (dir, kallsyms_filename, dir_sz); ret =0 ;break ; }
tools/perf/util/synthetic-events.c +2 -2
@@ -1979,7 +1979,7 @@ int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evseif (ev ==NULL )return -ENOMEM ; -strlcpy (ev->unit, evsel->unit, size +1 ); +strscpy (ev->unit, evsel->unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
@@ -2013,7 +2013,7 @@ int perf_event__synthesize_event_update_name(struct perf_tool *tool, struct evseif (ev ==NULL )return -ENOMEM ; -strlcpy (ev->name, evsel->name, len +1 ); +strscpy (ev->name, evsel->name, len +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
Signature · 1 line
2.40.1.606.ga4b1b128d6-goog
Quoted 8 lines · Azeem Shaikh
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
No return values were used, so direct replacement is safe.
Quoted 4 lines
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>
Signature · 1 line
Kees Cook
Arnaldo Carvalho de Melo
maintainerEm Tue, May 16, 2023 at 11:14:38AM -0700, Kees Cook escreveu:
Quoted 9 lines · Azeem Shaikh
Quoted 8 lines
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
No return values were used, so direct replacement is safe.
Quoted 6 lines
Quoted 4 lines
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>Reviewed-by Kees Cook <[email protected]>
Not building as strscpy() doesn't seem to be available for tools/ code, probably you'll need to first copy from the kernel too tools/lib/.
- Arnaldo
CLANG /tmp/build/perf-tools-next/util/bpf_skel/.tmp/sample_filter.bpf.ojvmti/libjvmti.c: In function ‘copy_class_filename’:jvmti/libjvmti.c:161:17: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
161 | strscpy(result, file_name, max_length);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[3]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/jvmti/libjvmti.o] Error 1
make[2]: *** [Makefile.perf:818: /tmp/build/perf-tools-next/jvmti/jvmti-in.o] Error 2
make[2]: *** Waiting for unfinished jobs..../var/home/acme/git/perf-tools-next/tools/perf/util/pmu-hybrid.c: In function ‘perf_pmu__hybrid_mounted’:/var/home/acme/git/perf-tools-next/tools/perf/util/pmu-hybrid.c:30:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
30 | strscpy(pmu_name, name, sizeof(pmu_name));
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
error: command '/usr/lib64/ccache/gcc' failed with exit code 1
cp: cannot stat '/tmp/build/perf-tools-next/python_ext_build/lib/perf*.so': No such file or directory make[2]: *** [Makefile.perf:651: /tmp/build/perf-tools-next/python/perf.cpython-311-x86_64-linux-gnu.so] Error 1
Auto-detecting system features:
... clang-bpf-co-re: [ on ]
... llvm: [ OFF ]
... libcap: [ on ] ... libbfd: [ on ]
MKDIR /tmp/build/perf-tools-next/util/bpf_skel/.tmp/bootstrap/libbpf/include/bpf
MKDIR /tmp/build/perf-tools-next/util/bpf_skel/.tmp/bootstrap/
CC /tmp/build/perf-tools-next/util/intel-pt-decoder/intel-pt-log.outil/llvm-utils.c: In function ‘search_program’:util/llvm-utils.c:83:33: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
83 | strscpy(output, def, PATH_MAX);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
CC /tmp/build/perf-tools-next/util/intel-pt-decoder/intel-pt-decoder.o
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:98: /tmp/build/perf-tools-next/util/llvm-utils.o] Error 1 make[4]: *** Waiting for unfinished jobs....
CC /tmp/build/perf-tools-next/util/cs-etm-base.o
CC /tmp/build/perf-tools-next/util/parse-branch-options.o
LD /tmp/build/perf-tools-next/util/cs-etm-decoder/perf-in.o
LD /tmp/build/perf-tools-next/util/hisi-ptt-decoder/perf-in.o
LD /tmp/build/perf-tools-next/util/arm-spe-decoder/perf-in.o
CC /tmp/build/perf-tools-next/util/intel-pt-decoder/intel-pt-insn-decoder.o
LD /tmp/build/perf-tools-next/util/scripting-engines/perf-in.o
util/pmu-hybrid.c: In function ‘perf_pmu__hybrid_mounted’:
util/pmu-hybrid.c:30:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
30 | strscpy(pmu_name, name, sizeof(pmu_name));
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/pmu-hybrid.o] Error 1 tests/symbols.c: In function ‘get_test_dso_filename’:tests/symbols.c:48:17: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
48 | strscpy(filename, dso_to_test, max_sz);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/tests/symbols.o] Error 1 make[4]: *** Waiting for unfinished jobs....tests/dlfilter-test.c: In function ‘get_dlfilters_path’:tests/dlfilter-test.c:237:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
237 | strscpy(buf, dirname(path), sz);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/tests/dlfilter-test.o] Error 1
make[3]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:140: tests] Error 2 /var/home/acme/git/perf-tools-next/tools/perf/util/pmu-hybrid.c: In function ‘perf_pmu__hybrid_mounted’:/var/home/acme/git/perf-tools-next/tools/perf/util/pmu-hybrid.c:30:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
30 | strscpy(pmu_name, name, sizeof(pmu_name));
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
error: command '/usr/lib64/ccache/gcc' failed with exit code 1
cp: cannot stat '/tmp/build/perf-tools-next/python_ext_build/lib/perf*.so': No such file or directory
make[2]: *** [Makefile.perf:651: /tmp/build/perf-tools-next/python/perf.cpython-311-x86_64-linux-gnu.so] Error 1 util/svghelper.c: In function ‘cpu_model’:util/svghelper.c:335:33: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
335 | strscpy(cpu_m, &buf[13], 255);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/svghelper.o] Error 1 util/dso.c: In function ‘filename__decompress’:util/dso.c:354:17: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
354 | strscpy(pathname, tmpbuf, len);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/dso.o] Error 1 util/symbol.c: In function ‘dso__load’:util/symbol.c:1970:33: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
1970 | strscpy(name, new_name, PATH_MAX);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/symbol.o] Error 1 util/annotate.c: In function ‘dso__disassemble_filename’:util/annotate.c:1718:33: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
1718 | strscpy(filename, new_name, filename_size);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/annotate.o] Error 1 util/synthetic-events.c: In function ‘perf_event__synthesize_event_update_unit’:util/synthetic-events.c:1982:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
1982 | strscpy(ev->unit, evsel->unit, size + 1);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/synthetic-events.o] Error 1 util/auxtrace.c: In function ‘auxtrace_synth_guest_error’:util/auxtrace.c:1216:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
1216 | strscpy(auxtrace_error->msg, msg, MAX_AUXTRACE_ERROR_MSG);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/auxtrace.o] Error 1 util/intel-pt-decoder/intel-pt-decoder.c: In function ‘intel_pt__strerror’:util/intel-pt-decoder/intel-pt-decoder.c:510:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
510 | strscpy(buf, intel_pt_err_msgs[code], buflen);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[5]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/intel-pt-decoder/intel-pt-decoder.o] Error 1 make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:140: intel-pt-decoder] Error 2util/machine.c: In function ‘machine__create_extra_kernel_map’:util/machine.c:1226:9: error: implicit declaration of function ‘strscpy’; did you mean ‘strlcpy’? [-Werror=implicit-function-declaration]
1226 | strscpy(kmap->name, xm->name, KMAP_NAME_LEN);
| ^~~~~~~
| strlcpycc1: all warnings being treated as errors
make[4]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:97: /tmp/build/perf-tools-next/util/machine.o] Error 1 make[3]: *** [/var/home/acme/git/perf-tools-next/tools/build/Makefile.build:140: util] Error 2
make[2]: *** [Makefile.perf:676: /tmp/build/perf-tools-next/perf-in.o] Error 2
CC /tmp/build/perf-tools-next/pmu-events/pmu-events.o
LD /tmp/build/perf-tools-next/pmu-events/pmu-events-in.o
make[1]: *** [Makefile.perf:236: sub-make] Error 2
make: *** [Makefile:113: install-bin] Error 2
make: Leaving directory '/var/home/acme/git/perf-tools-next/tools/perf'
Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf-tools-next -C tools/perf install-bin':
61899912971 cycles:u
106832920114 instructions:u # 1.73 insn per cycle
4.586621727 seconds time elapsed
14.384368000 seconds user
5.495604000 seconds sys⬢[acme@toolbox perf-tools-next]$
Arnaldo Carvalho de Melo
maintainerEm Tue, May 16, 2023 at 12:05:00AM +0000, Azeem Shaikh escreveu:
Quoted 7 lines
strlcpy()reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to removestrlcpy()completely [2], replacestrlcpy()here withstrscpy().
No return values were used, so direct replacement is safe.
Peter, I'll try and process the tools/ part, to check if this builds with all the test containers I have.
- Arnaldo
Quoted 413 lines
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89Signed-off-by Azeem Shaikh <[email protected]>--- kernel/events/core.c | 6 +++--- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/arch/x86/util/machine.c | 2 +- tools/perf/builtin-buildid-cache.c | 6 +++--- tools/perf/builtin-daemon.c | 4 ++-- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/tests/dlfilter-test.c | 2 +- tools/perf/tests/symbols.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/annotate.c | 4 ++-- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/dso.c | 2 +- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/llvm-utils.c | 4 ++-- tools/perf/util/machine.c | 8 ++++---- tools/perf/util/pmu-hybrid.c | 2 +- tools/perf/util/pmu.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 4 ++-- tools/perf/util/synthetic-events.c | 4 ++-- 21 files changed, 33 insertions(+), 33 deletions(-)kernel/events/core.c +3
-3@@ -8245,7 +8245,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)unsigned int size;memset (comm,0 ,sizeof (comm)); -strlcpy (comm, comm_event->task->comm,sizeof (comm)); +strscpy (comm, comm_event->task->comm,sizeof (comm)); size =ALIGN (strlen (comm)+1 ,sizeof (u64)); comm_event->comm = comm;@@ -8700,7 +8700,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) } cpy_name: -strlcpy (tmp, name,sizeof (tmp)); +strscpy (tmp, name,sizeof (tmp)); name = tmp; got_name:/* @@ -9124,7 +9124,7 @@ void perf_event_ksymbol(u16 ksym_type, u64 addr, u32 len, bool unregister, ksym_type == PERF_RECORD_KSYMBOL_TYPE_UNKNOWN) goto err; -strlcpy (name, sym,KSYM_NAME_LEN ); +strscpy (name, sym,KSYM_NAME_LEN ); name_len =strlen (name) +1 ;while (!IS_ALIGNED (name_len,sizeof (u64))) name[name_len++] ='\0' ;tools/perf/arch/x86/util/event.c +1
-1@@ -64,7 +64,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool, event->mmap.pgoff =map__pgoff (map); event->mmap.pid = machine->pid; -strlcpy (event->mmap.filename, kmap->name,PATH_MAX ); +strscpy (event->mmap.filename, kmap->name,PATH_MAX );if (perf_tool__process_synth_event (tool, event, machine, process) !=0 ) {tools/perf/arch/x86/util/machine.c +1
-1@@ -40,7 +40,7 @@ static int add_extra_kernel_map(struct extra_kernel_map_info *mi, u64 start, mi->maps[mi->cnt].start = start; mi->maps[mi->cnt].end = end; mi->maps[mi->cnt].pgoff = pgoff; -strlcpy (mi->maps[mi->cnt].name, name,KMAP_NAME_LEN ); +strscpy (mi->maps[mi->cnt].name, name,KMAP_NAME_LEN ); mi->cnt +=1 ;tools/perf/builtin-buildid-cache.c +3
-3@@ -36,7 +36,7 @@ static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)char root_dir[PATH_MAX ];char *p; -strlcpy (root_dir, proc_dir,sizeof (root_dir)); +strscpy (root_dir, proc_dir,sizeof (root_dir)); p =strrchr (root_dir,'/' );if (!p)@@ -104,7 +104,7 @@ static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir, to_dir, dent->d_name);if (!compare_proc_modules (from, to) &&same_kallsyms_reloc (from_dir, to_subdir)) { -strlcpy (to_dir, to_subdir, to_dir_sz); +strscpy (to_dir, to_subdir, to_dir_sz); ret =0 ;break ; }@@ -121,7 +121,7 @@ static int build_id_cache__add_kcore(const char *filename, bool force)char from_dir[PATH_MAX ], to_dir[PATH_MAX ];char *p; -strlcpy (from_dir, filename,sizeof (from_dir)); +strscpy (from_dir, filename,sizeof (from_dir)); p =strrchr (from_dir,'/' );if (!p ||strcmp (p +1 ,"kcore" ))tools/perf/builtin-daemon.c +2
-2@@ -606,7 +606,7 @@ static int setup_server_socket(struct daemon *daemon)memset (&addr,0 ,sizeof (addr)); addr.sun_family =AF_UNIX ; -strlcpy (addr.sun_path, path,sizeof (addr.sun_path) -1 ); +strscpy (addr.sun_path, path,sizeof (addr.sun_path) -1 );unlink (path);if (bind (fd, (struct sockaddr *)&addr,sizeof (addr)) ==-1 ) {@@ -877,7 +877,7 @@ static int setup_client_socket(struct daemon *daemon)memset (&addr,0 ,sizeof (addr)); addr.sun_family =AF_UNIX ; -strlcpy (addr.sun_path, path,sizeof (addr.sun_path) -1 ); +strscpy (addr.sun_path, path,sizeof (addr.sun_path) -1 );if (connect (fd, (struct sockaddr *) &addr,sizeof (addr)) ==-1 ) {perror ("failed: connect" );tools/perf/jvmti/libjvmti.c +1
-1@@ -158,7 +158,7 @@ copy_class_filename(const char * class_sign, const char * file_name, char * resu result[i] ='\0' ; }else {/* fallback case */ -strlcpy (result, file_name, max_length); +strscpy (result, file_name, max_length); } }tools/perf/tests/dlfilter-test.c +1
-1@@ -234,7 +234,7 @@ static int get_dlfilters_path(char *buf, size_t sz)if (access (path,R_OK ))return -1 ; } -strlcpy (buf,dirname (path), sz); +strscpy (buf,dirname (path), sz);return 0 ; }tools/perf/tests/symbols.c +1
-1@@ -45,7 +45,7 @@ static void exit_test_info(struct test_info *ti)static void get_test_dso_filename (char *filename,size_t max_sz) {if (dso_to_test) -strlcpy (filename, dso_to_test, max_sz); +strscpy (filename, dso_to_test, max_sz);else perf_exe (filename, max_sz); }tools/perf/ui/tui/helpline.c +1
-1@@ -24,7 +24,7 @@ static void tui_helpline__push(const char *msg)SLsmg_set_color (0 );SLsmg_write_nstring ((char *)msg, SLtt_Screen_Cols);SLsmg_refresh (); -strlcpy (ui_helpline__current, msg, sz); +strscpy (ui_helpline__current, msg, sz); }static int tui_helpline__show (const char *format,va_list ap)tools/perf/util/annotate.c +2
-2@@ -1702,7 +1702,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t filif (access (filename,R_OK ) && errno ==ENOENT && dso->nsinfo) {char *new_name =dso__filename_with_chroot (dso, filename);if (new_name) { -strlcpy (filename, new_name, filename_size); +strscpy (filename, new_name, filename_size);free (new_name); } }@@ -2002,7 +2002,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) kce.len = sym->end - sym->start;if (!kcore_extract__create (&kce)) { delete_extract = true; -strlcpy (symfs_filename, kce.extract_filename, +strscpy (symfs_filename, kce.extract_filename,sizeof (symfs_filename)); } }else if (dso__needs_decompress (dso)) {tools/perf/util/auxtrace.c +1
-1@@ -1213,7 +1213,7 @@ void auxtrace_synth_guest_error(struct perf_record_auxtrace_error *auxtrace_erro auxtrace_error->fmt =1 ; auxtrace_error->ip = ip; auxtrace_error->time = timestamp; -strlcpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG ); +strscpy (auxtrace_error->msg, msg,MAX_AUXTRACE_ERROR_MSG );if (machine_pid) { auxtrace_error->fmt =2 ; auxtrace_error->machine_pid = machine_pid;tools/perf/util/dso.c +1
-1@@ -318,7 +318,7 @@ int filename__decompress(const char *name, char *pathname,unlink (tmpbuf);if (pathname && (fd >=0 )) -strlcpy (pathname, tmpbuf, len); +strscpy (pathname, tmpbuf, len);return fd; }tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1
-1@@ -507,7 +507,7 @@ int intel_pt__strerror(int code, char *buf, size_t buflen) {if (code <1 || code >=INTEL_PT_ERR_MAX ) code =INTEL_PT_ERR_UNK ; -strlcpy (buf, intel_pt_err_msgs[code], buflen); +strscpy (buf, intel_pt_err_msgs[code], buflen);return 0 ; }tools/perf/util/llvm-utils.c +2
-2@@ -80,7 +80,7 @@ search_program(const char *def, const char *name,if (def && def[0 ] !='\0' ) {if (def[0 ] =='/' ) {if (access (def,F_OK ) ==0 ) { -strlcpy (output, def,PATH_MAX ); +strscpy (output, def,PATH_MAX );return 0 ; } }else if (def[0 ] !='\0' )@@ -99,7 +99,7 @@ search_program(const char *def, const char *name,while (path) {scnprintf (buf,sizeof (buf),"%s/%s" , path, name);if (access (buf,F_OK ) ==0 ) { -strlcpy (output, buf,PATH_MAX ); +strscpy (output, buf,PATH_MAX ); ret =0 ;break ; }tools/perf/util/machine.c +4
-4@@ -1223,7 +1223,7 @@ int machine__create_extra_kernel_map(struct machine *machine, kmap =map__kmap (map); -strlcpy (kmap->name, xm->name,KMAP_NAME_LEN ); +strscpy (kmap->name, xm->name,KMAP_NAME_LEN ); err =maps__insert (machine__kernel_maps (machine), map);@@ -1314,7 +1314,7 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine, .pgoff = pgoff, }; -strlcpy (xm.name,ENTRY_TRAMPOLINE_NAME ,KMAP_NAME_LEN ); +strscpy (xm.name,ENTRY_TRAMPOLINE_NAME ,KMAP_NAME_LEN );if (machine__create_extra_kernel_map (machine, kernel, &xm) <0 )return -1 ;@@ -1935,7 +1935,7 @@ int machine__process_mmap2_event(struct machine *machine, .pgoff = event->mmap2.pgoff, }; -strlcpy (xm.name, event->mmap2.filename,KMAP_NAME_LEN ); +strscpy (xm.name, event->mmap2.filename,KMAP_NAME_LEN ); ret =machine__process_kernel_mmap_event (machine, &xm, bid);if (ret <0 ) goto out_problem;@@ -1992,7 +1992,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event .pgoff = event->mmap.pgoff, }; -strlcpy (xm.name, event->mmap.filename,KMAP_NAME_LEN ); +strscpy (xm.name, event->mmap.filename,KMAP_NAME_LEN ); ret =machine__process_kernel_mmap_event (machine, &xm,NULL );if (ret <0 ) goto out_problem;tools/perf/util/pmu-hybrid.c +1
-1@@ -27,7 +27,7 @@ bool perf_pmu__hybrid_mounted(const char *name)if (strncmp (name,"cpu_" ,4 ))return false; -strlcpy (pmu_name, name,sizeof (pmu_name)); +strscpy (pmu_name, name,sizeof (pmu_name));return perf_pmu__scan_file (&pmu,"cpus" ,"%u" , &cpu) >0 ; }tools/perf/util/pmu.c +1
-1@@ -599,7 +599,7 @@ static struct perf_cpu_map *pmu_cpumask(int dirfd, const char *name)struct perf_pmu pmu = {.name = pmu_name};FILE *file; -strlcpy (pmu_name, name,sizeof (pmu_name)); +strscpy (pmu_name, name,sizeof (pmu_name));for (template = templates; *template; template++) { file =perf_pmu__open_file_at (&pmu, dirfd, *template);if (!file)tools/perf/util/probe-file.c +1
-1@@ -459,7 +459,7 @@ static int probe_cache__open(struct probe_cache *pcache, const char *target,if (target &&build_id_cache__cached (target)) {/* This is a cached buildid */ -strlcpy (sbuildid, target,SBUILD_ID_SIZE ); +strscpy (sbuildid, target,SBUILD_ID_SIZE ); dir_name =build_id_cache__linkname (sbuildid,NULL ,0 ); goto found; }tools/perf/util/svghelper.c +1
-1@@ -332,7 +332,7 @@ static char *cpu_model(void)if (file) {while (fgets (buf,255 , file)) {if (strstr (buf,"model name" )) { -strlcpy (cpu_m, &buf[13 ],255 ); +strscpy (cpu_m, &buf[13 ],255 );break ; } }tools/perf/util/symbol.c +2
-2@@ -1967,7 +1967,7 @@ int dso__load(struct dso *dso, struct map *map)char *new_name =dso__filename_with_chroot (dso, name);if (new_name) { is_reg =is_regular_file (new_name); -strlcpy (name, new_name,PATH_MAX ); +strscpy (name, new_name,PATH_MAX );free (new_name); } }@@ -2254,7 +2254,7 @@ static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)scnprintf (kallsyms_filename,sizeof (kallsyms_filename),"%s/%s/kallsyms" , dir, nd->s);if (!validate_kcore_addresses (kallsyms_filename, map)) { -strlcpy (dir, kallsyms_filename, dir_sz); +strscpy (dir, kallsyms_filename, dir_sz); ret =0 ;break ; }tools/perf/util/synthetic-events.c +2
-2@@ -1979,7 +1979,7 @@ int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evseif (ev ==NULL )return -ENOMEM ; -strlcpy (ev->unit, evsel->unit, size +1 ); +strscpy (ev->unit, evsel->unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;@@ -2013,7 +2013,7 @@ int perf_event__synthesize_event_update_name(struct perf_tool *tool, struct evseif (ev ==NULL )return -ENOMEM ; -strlcpy (ev->name, evsel->name, len +1 ); +strscpy (ev->name, evsel->name, len +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;Signature · 1 line
2.40.1.606.ga4b1b128d6-goog
Signature · 1 line
- Arnaldo