diff --git a/packages/k/ksysguard5/.files b/packages/k/ksysguard5/.files index 79b7b55..e79bd65 100644 Binary files a/packages/k/ksysguard5/.files and b/packages/k/ksysguard5/.files differ diff --git a/packages/k/ksysguard5/.rev b/packages/k/ksysguard5/.rev index 0445279..ef63cf8 100644 --- a/packages/k/ksysguard5/.rev +++ b/packages/k/ksysguard5/.rev @@ -1018,4 +1018,12 @@ Wed Sep 3 21:20:56 UTC 2014 - hrvoje.senjan@gmail.com Plasma 5.22.3 (forwarded request 904425 from Vogtinator) 904507 + + 58e2cbad05a9f52e71dc2380e0568dc7 + 5.22.0 + + dimstar_suse + + 983580 + diff --git a/packages/k/ksysguard5/0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch b/packages/k/ksysguard5/0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch new file mode 100644 index 0000000..dced740 --- /dev/null +++ b/packages/k/ksysguard5/0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch @@ -0,0 +1,34 @@ +From cb52be2f743a6717355445889dd3e2e265ad75fa Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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 + diff --git a/packages/k/ksysguard5/ksysguard5.changes b/packages/k/ksysguard5/ksysguard5.changes index 04a7e52..0cd1635 100644 --- a/packages/k/ksysguard5/ksysguard5.changes +++ b/packages/k/ksysguard5/ksysguard5.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Jun 18 12:45:34 UTC 2022 - Fabian Vogt + +- Add patch to fix crash with _FORTIFY_SOURCE=3 (boo#1200656): + * 0001-lmsensors-Fix-buffer-size-passed-to-snprintf.patch + +------------------------------------------------------------------- Sat Jun 26 20:00:47 UTC 2021 - Fabian Vogt - s390 has no libsensors diff --git a/packages/k/ksysguard5/ksysguard5.spec b/packages/k/ksysguard5/ksysguard5.spec index 7b98e34..7b0665c 100644 --- a/packages/k/ksysguard5/ksysguard5.spec +++ b/packages/k/ksysguard5/ksysguard5.spec @@ -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 @@ Source2: plasma.keyring 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