bpftool: Replace strncpy with strscpy
PATCH 1/1 bpftool: Replace strncpy with strscpy
strncpy() is deprecated for NUL-terminated destination buffers. Use strscpy() instead and remove the manual NUL-termination.
Compile-tested only.
--- tools/bpf/bpftool/xlated_dumper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/bpf/bpftool/xlated_dumper.c +1 -2
@@ -135,8 +135,7 @@ print_insn_json(void *private_data, const char *fmt, ...)va_start (args, fmt);if (l >0 ) { -strncpy (chomped_fmt, fmt, l -1 ); - chomped_fmt[l -1 ] ='\0' ; +strscpy (chomped_fmt, fmt); }jsonw_vprintf_enquote (json_wtr, chomped_fmt, args);va_end (args);
--
2.25.1
Quentin Monnet
maintainer2025-02-28 19:18 UTC+0100 ~ Michael Estner <[email protected]>
Quoted 4 lines
strncpy()is deprecated for NUL-terminated destination buffers. Usestrscpy()instead and remove the manual NUL-termination.Compile-tested only.
How? The change does _not_ compile in my case:
$ cd tool/bpf/bpftool $ make -j [...] /usr/bin/ld: xlated_dumper.o: in function `print_insn_json': xlated_dumper.c:(.text+0x1f6): undefined reference to `strscpy' collect2: error: ld returned 1 exit status make: *** [Makefile:254: bpftool] Error 1
(Besides, this code should be rather easy to test, so running it is appreciated.)
strscpy() has been proposed for bpftool a few times in the past, but bpftool is a user space utility and does not currently #include header linux/string.h. If we wanted to use strscpy(), we'd likely need to use this header, and also to copy the definition of the function to the GitHub mirror. Given that - as far as I know - the current use of strncpy() is not broken, I'm not sure this is worth the effort.
Quoted 1 line
I note that this Issue provides a command for looking for strncpy() instances to replace, but this command filters out occurrences that are under tools/:
"git grep ... | grep -vE '^(Documentation|tools|...) ..."
Thanks,
Quentin