From: Kienan Stewart Date: Thu, 1 Feb 2024 19:02:19 +0000 (-0500) Subject: Remove strlcpy usage X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=30e8923f862ee435d3546aee44997aace1e7e9d1;p=lttng-modules.git Remove strlcpy usage The replacement for `strlcpy`, `strscpy`, was introduced in Linux 4.3. As lttng-modules master aims to support Linux 4.4+ at this time, the version check can safely be removed. See upstream commit: commit 30035e45753b708e7d47a98398500ca005e02b86 Author: Chris Metcalf Date: Wed Apr 29 12:52:04 2015 -0400 string: provide strscpy() The strscpy() API is intended to be used instead of strlcpy(), and instead of most uses of strncpy(). - Unlike strlcpy(), it doesn't read from memory beyond (src + size). - Unlike strlcpy() or strncpy(), the API provides an easy way to check for destination buffer overflow: an -E2BIG error return value. - The provided implementation is robust in the face of the source buffer being asynchronously changed during the copy, unlike the current implementation of strlcpy(). - Unlike strncpy(), the destination buffer will be NUL-terminated if the string in the source buffer is too long. - Also unlike strncpy(), the destination buffer will not be updated beyond the NUL termination, avoiding strncpy's behavior of zeroing the entire tail end of the destination buffer. (A memset() after the strscpy() can be used if this behavior is desired.) - The implementation should be reasonably performant on all platforms since it uses the asm/word-at-a-time.h API rather than simple byte copy. Kernel-to-kernel string copy is not considered to be performance critical in any case. Change-Id: I31fefde148d5b63a30532fbcb4b59bb951bba902 Signed-off-by: Kienan Stewart Signed-off-by: Mathieu Desnoyers --- diff --git a/src/lib/ringbuffer/ring_buffer_backend.c b/src/lib/ringbuffer/ring_buffer_backend.c index c3067d03..02a9d487 100644 --- a/src/lib/ringbuffer/ring_buffer_backend.c +++ b/src/lib/ringbuffer/ring_buffer_backend.c @@ -405,11 +405,7 @@ int channel_backend_init(struct channel_backend *chanb, chanb->extra_reader_sb = (config->mode == RING_BUFFER_OVERWRITE) ? 1 : 0; chanb->num_subbuf = num_subbuf; -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) strscpy(chanb->name, name, NAME_MAX); -#else - strlcpy(chanb->name, name, NAME_MAX); -#endif memcpy(&chanb->config, config, sizeof(chanb->config)); if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {