SHA256
1
0
forked from pool/qclib

Accepting request 1146219 from home:ngueorguiev:branches:hardware

- Upgrade to version 2.4.1 (jsc#PED-3285)
  * Handle systems with `/sys/kernel/security/lockdown` enabled
  * Consistency check: Fix accounting of reserved cores and CPUs
  * Trace: Fix display of version information
  * Doxygen config: Remove unused options 
- Removed obsolete patch qclib-sys-kernel-security-lockdown-enabled.patch

OBS-URL: https://build.opensuse.org/request/show/1146219
OBS-URL: https://build.opensuse.org/package/show/hardware/qclib?expand=0&rev=45
This commit is contained in:
Nikolay Gueorguiev 2024-02-12 15:48:46 +00:00 committed by Git OBS Bridge
parent 19a28b9682
commit 80395b9768
5 changed files with 16 additions and 57 deletions

BIN
qclib-2.4.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
qclib-2.4.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,51 +0,0 @@
commit 73f9792009be42fe652ae897d390852f18bf445a
Author: Stefan Raspl <raspl@linux.ibm.com>
Date: Thu Sep 7 22:47:16 2023 +0200
Handle systems with /sys/kernel/security/lockdown enabled
Hypfs becomes inaccessible when /sys/kernel/security/lockdown is enabled, as
is the case with e.g. secure booted systems.
To reproduce, run
echo integrity > /sys/kernel/security/lockdown
Since qclib conceptually only requires access to /proc/sysinfo at a minimum,
we simply skip hypfs in this case.
Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
diff --git a/query_capacity_hypfs.c b/query_capacity_hypfs.c
index 9845e88b..3907c269 100644
--- a/query_capacity_hypfs.c
+++ b/query_capacity_hypfs.c
@@ -617,7 +617,7 @@ static int qc_read_diag_file(struct qc_handle *hdl, const char *dbgfs, struct hy
out_fail:
free(priv->data);
priv->data = NULL;
- rc = -1;
+ rc = 1;
out:
free(fpath);
@@ -942,14 +942,18 @@ static int qc_hypfs_open(struct qc_handle *hdl, char **buf) {
/* if z/VM diag file exists, the LPAR diag file's content
isn't valid, so we're done after handling the z/VM file */
priv->diag = QC_HYPFS_ZVM;
- if ((rc = qc_read_diag_file(hdl, dbgfs, priv)) != 0)
+ if ((rc = qc_read_diag_file(hdl, dbgfs, priv)) != 0) {
+ rc = 0; // not a fatal error - we just skip this source
goto out;
+ }
priv->avail = HYPFS_AVAIL_BIN_ZVM;
} else {
qc_debug(hdl, "No z/VM diag file found, must be an LPAR\n");
priv->diag = QC_HYPFS_LPAR;
- if ((rc = qc_read_diag_file(hdl, dbgfs, priv)) != 0)
+ if ((rc = qc_read_diag_file(hdl, dbgfs, priv)) != 0) {
+ rc = 0; // not a fatal error - we just skip this source
goto out;
+ }
priv->avail = HYPFS_AVAIL_BIN_LPAR;
}
} else {

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 12 16:48:47 UTC 2024 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Upgrade to version 2.4.1 (jsc#PED-3285)
* Handle systems with `/sys/kernel/security/lockdown` enabled
* Consistency check: Fix accounting of reserved cores and CPUs
* Trace: Fix display of version information
* Doxygen config: Remove unused options
- Removed obsolete patch qclib-sys-kernel-security-lockdown-enabled.patch
-------------------------------------------------------------------
Wed Oct 25 06:16:21 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package qclib
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
Name: qclib
Version: 2.4.0
Version: 2.4.1
Release: 0
Summary: Query Capacity library
License: BSD-3-Clause
@ -37,7 +37,7 @@ BuildRequires: glibc-devel
%endif
#
Patch001: qclib-sys-kernel-security-lockdown-enabled.patch
### Patch001: qclib-sys-kernel-security-lockdown-enabled.patch
%description
qclib provides a C API for extraction of system information for Linux on z