From: Kienan Stewart Date: Mon, 22 Jan 2024 16:47:40 +0000 (-0500) Subject: Fix: strlcpy removed in linux 6.8.0-rc1 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a3d0aa6872fb70b8162e6e1dc2b3aaad112213eb;p=lttng-modules.git Fix: strlcpy removed in linux 6.8.0-rc1 See upstream commit: commit d26270061ae66b915138af7cd73ca6f8b85e6b44 Author: Kees Cook Date: Thu Jan 18 12:31:55 2024 -0800 string: Remove strlcpy() With all the users of strlcpy() removed[1] from the kernel, remove the API, self-tests, and other references. Leave mentions in Documentation (about its deprecation), and in checkpatch.pl (to help migrate host-only tools/ usage). Long live strscpy(). The replacement interface, `strscpy`, has been available since linux 4.3, introduced in the upstream commit 30c44659f4a3e7e1f9f47e895591b4b40bf62671. As lttng-modules master branch targets linux 4.4+ at this time, `strlcpy` can be replaced with `strscpy`. Change-Id: I27cdff70a504b25340cc59150ed8e959d9629e43 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 2b88b11c..c3067d03 100644 --- a/src/lib/ringbuffer/ring_buffer_backend.c +++ b/src/lib/ringbuffer/ring_buffer_backend.c @@ -405,7 +405,11 @@ 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) {