- update str(l|s)cpy usage

diff --git a/kernel-strcpy.patch b/kernel-strcpy.patch
new file mode 100644 (file)
index 0000000..63ec8e2
--- /dev/null
+++ b/kernel-strcpy.patch
@@ -0,0 +1,12 @@
+diff -ur lttng-modules-2.13.11/lttng-modules-2.13.11/src/lib/ringbuffer/ring_buffer_backend.c lttng-modules-2.13.11.strcpy/lttng-modules-2.13.11/src/lib/ringbuffer/ring_buffer_backend.c
+--- lttng-modules-2.13.11/lttng-modules-2.13.11/src/lib/ringbuffer/ring_buffer_backend.c       2024-01-10 21:35:48.000000000 +0100
++++ lttng-modules-2.13.11.strcpy/lttng-modules-2.13.11/src/lib/ringbuffer/ring_buffer_backend.c        2024-03-17 00:20:50.475514756 +0100
+@@ -405,7 +405,7 @@
+       chanb->extra_reader_sb =
+                       (config->mode == RING_BUFFER_OVERWRITE) ? 1 : 0;
+       chanb->num_subbuf = num_subbuf;
+-      strlcpy(chanb->name, name, NAME_MAX);
++      strscpy(chanb->name, name, NAME_MAX);
+       memcpy(&chanb->config, config, sizeof(chanb->config));
+ 
+       if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 1d1f91caea781bc68ff9bf3ae7c97f8a0224af4d..ec67a4c81960687b97252e2d87db82a51aa97160 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -18,6 +18,7 @@ Group:                Base/Kernel
 Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
 # Source0-md5: 306dc7994fd020e7a21e0c64d42ee95c
 Patch0:                build.patch
+Patch1:                kernel-strcpy.patch
 URL:           https://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0}
 %{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:3.0}}
@@ -94,6 +95,7 @@ p=`pwd`\
 %setup -qc -n %{name}-%{version}
 cd %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd  %{pname}-%{version}