Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ksysguard5 for openSUSE:Factory
checked in at 2022-06-18 22:06:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksysguard5 (Old)
and /work/SRC/openSUSE:Factory/.ksysguard5.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksysguard5"
Sat Jun 18 22:06:21 2022 rev:122 rq:983580 version:5.22.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ksysguard5/ksysguard5.changes 2021-07-09
23:59:54.100262125 +0200
+++ /work/SRC/openSUSE:Factory/.ksysguard5.new.1548/ksysguard5.changes
2022-06-18 22:06:25.059675528 +0200
@@ -1,0 +2,6 @@
+Sat Jun 18 12:45:34 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix crash with _FORTIFY_SOURCE=3 (boo#1200656):
+ * 0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch
+
+-------------------------------------------------------------------
New:
----
0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksysguard5.spec ++++++
--- /var/tmp/diff_new_pack.K1ysq7/_old 2022-06-18 22:06:25.703676443 +0200
+++ /var/tmp/diff_new_pack.K1ysq7/_new 2022-06-18 22:06:25.707676448 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ksysguard5
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@
Source3: ksysguardd.service
# PATCH-FIX-OPENSUSE 0001-Use-run-for-ksysguardd-s-pid-file.patch
Patch0: 0001-Use-run-for-ksysguardd-s-pid-file.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch
BuildRequires: extra-cmake-modules >= 5.81.0
BuildRequires: kf5-filesystem
%ifnarch s390 s390x
++++++ 0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch ++++++
>From cb52be2f743a6717355445889dd3e2e265ad75fa Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Sat, 18 Jun 2022 14:39:41 +0200
Subject: [PATCH] lmsensors: Fix buffer size passed to snprintf
Pass the actual size of the buffer to snprintf, otherwise the program aborts
if built with _FORTIFY_SOURCE=3.
---
ksysguardd/Linux/lmsensors.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ksysguardd/Linux/lmsensors.c b/ksysguardd/Linux/lmsensors.c
index d55c55c4..63097f7f 100644
--- a/ksysguardd/Linux/lmsensors.c
+++ b/ksysguardd/Linux/lmsensors.c
@@ -164,10 +164,11 @@ void initLmSensors( struct SensorModul* sm )
label = sensors_get_label( scn, sf );
sensors_snprintf_chip_name(scnbuf, BUFFER_SIZE_LMSEN, scn);
p = (LMSENSOR*)malloc( sizeof( LMSENSOR ) );
- p->fullName = (char*)malloc( strlen( "lmsensors/" ) +
- strlen( scnbuf ) + 1 +
- strlen( label ) + 1 );
- snprintf( p->fullName, BUFFER_SIZE_LMSEN, "lmsensors/%s/%s", scnbuf,
label );
+ const int fullNameLen = strlen( "lmsensors/" ) +
+ strlen( scnbuf ) + 1 +
+ strlen( label ) + 1;
+ p->fullName = (char*)malloc( fullNameLen );
+ snprintf( p->fullName, fullNameLen, "lmsensors/%s/%s", scnbuf, label );
/* Make sure that name contains only proper characters. */
for ( s = p->fullName; *s; s++ )
--
2.36.1
