[packages/lttng-modules] - update str(l|s)cpy usage

[baggins]

commit 38eac45c17e38816e03b4955b83fd98e60b6a2b5
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date:   Sun Mar 17 00:22:03 2024 +0100

    - update str(l|s)cpy usage

 kernel-strcpy.patch | 12 ++++++++++++
 lttng-modules.spec  |  2 ++
 2 files changed, 14 insertions(+)
---
diff --git a/lttng-modules.spec b/lttng-modules.spec
index 1d1f91c..ec67a4c 100644
--- 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}
diff --git a/kernel-strcpy.patch b/kernel-strcpy.patch
new file mode 100644
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) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/38eac45c17e38816e03b4955b83fd98e60b6a2b5

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit