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: Fix memory leak

Browse Source 
The APQN check routine as well as the properties helper functions
do not free all memory that they allocated.

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
2018-06-07 15:34:56 +02:00
committed by Jan Höppner
parent 6a99d95d4f
commit d6a96f07c1
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zkey/keystore.c
View File

@@ -981,25 +981,33 @@ static int _keystore_apqn_check(const char *apqn, bool remove,
rc = regexec(&reg_buf, apqn, (size_t) 1, pmatch, 0);
if (rc != 0) {
warnx("the APQN '%s' is not valid", apqn);
return -EINVAL;
rc = -EINVAL;
goto out;
}
if (sscanf(apqn, "%x.%x", &card, &domain) != 2)
return -EINVAL;
if (sscanf(apqn, "%x.%x", &card, &domain) != 2) {
rc = -EINVAL;
goto out;
}
util_asprintf(normalized, "%02x.%04x", card, domain);
if (remove)
return 0;
if (remove) {
rc = 0;
goto out;
}
rc = _keystore_is_apqn_online(card, domain);
if (rc != 1) {
warnx("The APQN %02x.%04x is %s", card, domain,
rc == -1 ? "not a CCA card" : "not online");
return -EIO;
rc = -EIO;
goto out;
}
return 0;
out:
regfree(&reg_buf);
return rc;
}

5
zkey/properties.c
View File

@@ -149,6 +149,7 @@ void properties_free(struct properties *properties)
free(property->name);
free(property->value);
util_list_remove(&properties->list, property);
free(property);
}
free(properties);
@@ -259,6 +260,7 @@ int properties_remove(struct properties *properties, const char *name)
free(property->name);
free(property->value);
util_list_remove(&properties->list, property);
free(property);
return 0;
}
@@ -614,10 +616,13 @@ char *str_list_remove(const char *str_list, const char *str)
*/
void str_list_free_string_array(char **strings)
{
char **list = strings;
util_assert(strings != NULL, "Internal error: strings is NULL");
while (*strings != NULL) {
free((void *)*strings);
strings++;
}
free(list);
}