diff options
| author | Colin Ian King <colin.king@canonical.com> | 2016-04-28 15:24:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-28 16:02:28 +0200 |
| commit | 983d9e065b37dac5aaa2d5a819bdd5b5a0b78c8c (patch) | |
| tree | 77545e6fe46603334d6c6585ae00532f024e6872 | |
| parent | Honour user's LDFLAGS (diff) | |
| download | linux-983d9e065b37dac5aaa2d5a819bdd5b5a0b78c8c.tar.xz linux-983d9e065b37dac5aaa2d5a819bdd5b5a0b78c8c.zip | |
cpupower: bench: parse.c: fix several resource leaks
The error handling in prepare_output has several issues with
resource leaks. Ensure that filename is free'd and the directory
stream DIR is closed before returning.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Thomas Renninger <trenn@suse.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | tools/power/cpupower/bench/parse.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c index f503fb53824e..2d09c9221ff1 100644 --- a/tools/power/cpupower/bench/parse.c +++ b/tools/power/cpupower/bench/parse.c @@ -81,14 +81,18 @@ FILE *prepare_output(const char *dirname) len = strlen(dirname) + 30; filename = malloc(sizeof(char) * len); + if (!filename) { + perror("malloc"); + goto out_dir; + } if (uname(&sysdata) == 0) { len += strlen(sysdata.nodename) + strlen(sysdata.release); filename = realloc(filename, sizeof(char) * len); - if (filename == NULL) { + if (!filename) { perror("realloc"); - return NULL; + goto out_dir; } snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log", @@ -104,12 +108,16 @@ FILE *prepare_output(const char *dirname) if (output == NULL) { perror("fopen"); fprintf(stderr, "error: unable to open logfile\n"); + goto out; } fprintf(stdout, "Logfile: %s\n", filename); - free(filename); fprintf(output, "#round load sleep performance powersave percentage\n"); +out: + free(filename); +out_dir: + closedir(dir); return output; } |