kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zkey: Adjust CCA host library version detection for newer CCA versions

Browse Source 
Newer CCA versions might report the version string with CSUACFV or CSUACFQ
with keyword STATCCA using a different indicator character after the
version information. Ignore the indication character and the remaining
data entirely. Only the version information as such is of interest.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Ingo Franzki
2025-04-03 11:26:47 +02:00
committed by Jan Höppner
parent 7e832ead9e
commit 33fc534a81
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zkey/cca.c
View File

@@ -91,7 +91,6 @@ static int get_cca_version(struct cca_lib *cca, bool verbose)
long return_code, reason_code;
long version_data_length;
long exit_data_len = 0;
char date[20];
util_assert(cca != NULL, "Internal error: cca is NULL");
@@ -111,8 +110,8 @@ static int get_cca_version(struct cca_lib *cca, bool verbose)
version_data[sizeof(version_data) - 1] = '\0';
pr_verbose(verbose, "CCA Version string: %s", version_data);
if (sscanf((char *)version_data, "%u.%u.%uz%s", &cca->version.ver,
&cca->version.rel, &cca->version.mod, date) != 4) {
if (sscanf((char *)version_data, "%u.%u.%u", &cca->version.ver,
&cca->version.rel, &cca->version.mod) != 3) {
warnx("CCA library version is invalid: %s", version_data);
return -EINVAL;
}
@@ -536,7 +535,7 @@ static int get_cca_adapter_version(struct cca_lib *cca,
pr_verbose(verbose, "CCA firmware version string: %s", version_data);
if (sscanf((char *)version_data, "%u.%u.%uz", &version->ver,
if (sscanf((char *)version_data, "%u.%u.%u", &version->ver,
&version->rel, &version->mod) != 3) {
warnx("CCA formware version is invalid: %s", version_data);
return -EINVAL;