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

cpumf/lshwc: Free buffer allocated with malloc

Browse Source 
Free all buffers allocated with malloc before program exit.
Handle memory leak in libcpumf_cpuset().

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Thomas Richter
2024-11-27 13:36:05 +01:00
committed by Jan Höppner
parent 9df45d4256
commit 3c5fb0f885
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpumf/lshwc.c
View File

@@ -767,5 +767,6 @@ int main(int argc, char **argv)
}
free_counternames();
free(check);
free(ioctlbuffer);
return ch;
}

11
libcpumf/libcpumf_cpuset.c
View File

@@ -11,14 +11,14 @@
#include <stdbool.h>
#include "lib/libcpumf.h"
#include "lib/util_libc.h"
int libcpumf_cpuset(const char *parm, cpu_set_t *mask)
{
char *cp, *buffer = strdup(parm);
char *cp, *buffer = util_strdup(parm);
char *cp2 = buffer;
int to, from, rc;
if (!buffer) /* Errno set to ENOMEM */
return -1;
/* Check for invalid characters, such as 11.12 instead 11-12
* but allow blanks and newline. Newline is appended
* when the string is taken from sysfs files, for example
@@ -26,7 +26,8 @@ int libcpumf_cpuset(const char *parm, cpu_set_t *mask)
*/
if (strspn(buffer, "0123456789-,\n ") != strlen(buffer)) {
errno = EINVAL;
return -1;
rc = -1;
goto out;
}
CPU_ZERO(mask);
for (; (cp = strtok(buffer, ",")); buffer = NULL) {
@@ -51,7 +52,7 @@ int libcpumf_cpuset(const char *parm, cpu_set_t *mask)
}
rc = 0;
out:
free(buffer);
free(cp2);
return rc;
}