* [PATCH] cpupower: fix potential memory leak
@ 2015-08-22 12:01 Arjun Sreedharan
2015-09-11 19:51 ` Arjun Sreedharan
0 siblings, 1 reply; 5+ messages in thread
From: Arjun Sreedharan @ 2015-08-22 12:01 UTC (permalink / raw)
To: Thomas Renninger; +Cc: linux-pm, linux-kernel
Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
---
tools/power/cpupower/bench/parse.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
index f503fb5..058a351 100644
--- a/tools/power/cpupower/bench/parse.c
+++ b/tools/power/cpupower/bench/parse.c
@@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
{
FILE *output = NULL;
int len;
- char *filename;
+ char *filename, *filename_tmp;
struct utsname sysdata;
DIR *dir;
@@ -80,17 +80,19 @@ FILE *prepare_output(const char *dirname)
}
len = strlen(dirname) + 30;
- filename = malloc(sizeof(char) * len);
+ filename = malloc(sizeof(*filename) * len);
if (uname(&sysdata) == 0) {
len += strlen(sysdata.nodename) + strlen(sysdata.release);
- filename = realloc(filename, sizeof(char) * len);
+ filename_tmp = realloc(filename, sizeof(*filename) * len);
- if (filename == NULL) {
+ if (filename_tmp == NULL) {
+ free(filename);
perror("realloc");
return NULL;
}
+ filename = filename_tmp;
snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
dirname, sysdata.nodename, sysdata.release, time(NULL));
} else {
--
2.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] cpupower: fix potential memory leak
2015-08-22 12:01 Arjun Sreedharan
@ 2015-09-11 19:51 ` Arjun Sreedharan
0 siblings, 0 replies; 5+ messages in thread
From: Arjun Sreedharan @ 2015-09-11 19:51 UTC (permalink / raw)
To: Thomas Renninger; +Cc: linux-pm, linux-kernel@vger.kernel.org
Ping !
On 22 August 2015 at 17:31, Arjun Sreedharan <arjun024@gmail.com> wrote:
> Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
> ---
> tools/power/cpupower/bench/parse.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
> index f503fb5..058a351 100644
> --- a/tools/power/cpupower/bench/parse.c
> +++ b/tools/power/cpupower/bench/parse.c
> @@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
> {
> FILE *output = NULL;
> int len;
> - char *filename;
> + char *filename, *filename_tmp;
> struct utsname sysdata;
> DIR *dir;
>
> @@ -80,17 +80,19 @@ FILE *prepare_output(const char *dirname)
> }
>
> len = strlen(dirname) + 30;
> - filename = malloc(sizeof(char) * len);
> + filename = malloc(sizeof(*filename) * len);
>
> if (uname(&sysdata) == 0) {
> len += strlen(sysdata.nodename) + strlen(sysdata.release);
> - filename = realloc(filename, sizeof(char) * len);
> + filename_tmp = realloc(filename, sizeof(*filename) * len);
>
> - if (filename == NULL) {
> + if (filename_tmp == NULL) {
> + free(filename);
> perror("realloc");
> return NULL;
> }
>
> + filename = filename_tmp;
> snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
> dirname, sysdata.nodename, sysdata.release, time(NULL));
> } else {
> --
> 2.4.5
>
--
Arjun Sreedharan
arjunsreedharan.org
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] cpupower: fix potential memory leak
@ 2016-02-14 7:59 Arjun Sreedharan
0 siblings, 0 replies; 5+ messages in thread
From: Arjun Sreedharan @ 2016-02-14 7:59 UTC (permalink / raw)
To: Rickard Strandqvist, Dominik Brodowski; +Cc: linux-pm, linux-kernel
Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
---
tools/power/cpupower/bench/parse.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
index f503fb5..058a351 100644
--- a/tools/power/cpupower/bench/parse.c
+++ b/tools/power/cpupower/bench/parse.c
@@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
{
FILE *output = NULL;
int len;
- char *filename;
+ char *filename, *filename_tmp;
struct utsname sysdata;
DIR *dir;
@@ -80,17 +80,19 @@ FILE *prepare_output(const char *dirname)
}
len = strlen(dirname) + 30;
- filename = malloc(sizeof(char) * len);
+ filename = malloc(sizeof(*filename) * len);
if (uname(&sysdata) == 0) {
len += strlen(sysdata.nodename) + strlen(sysdata.release);
- filename = realloc(filename, sizeof(char) * len);
+ filename_tmp = realloc(filename, sizeof(*filename) * len);
- if (filename == NULL) {
+ if (filename_tmp == NULL) {
+ free(filename);
perror("realloc");
return NULL;
}
+ filename = filename_tmp;
snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
dirname, sysdata.nodename, sysdata.release, time(NULL));
} else {
--
2.4.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] cpupower: fix potential memory leak
@ 2016-04-29 7:00 Thomas Renninger
2016-05-05 23:37 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Renninger @ 2016-04-29 7:00 UTC (permalink / raw)
To: rafael; +Cc: linux-pm, arjun024, trenn
From: Arjun Sreedharan <arjun024@gmail.com>
Signed-off-by: Thomas Renninger <trenn@suse.com>
---
tools/power/cpupower/bench/parse.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/power/cpupower/bench/parse.c b/tools/power/cpupower/bench/parse.c
index 2d09c92..9b65f05 100644
--- a/tools/power/cpupower/bench/parse.c
+++ b/tools/power/cpupower/bench/parse.c
@@ -65,7 +65,7 @@ FILE *prepare_output(const char *dirname)
{
FILE *output = NULL;
int len;
- char *filename;
+ char *filename, *filename_tmp;
struct utsname sysdata;
DIR *dir;
@@ -88,13 +88,15 @@ FILE *prepare_output(const char *dirname)
if (uname(&sysdata) == 0) {
len += strlen(sysdata.nodename) + strlen(sysdata.release);
- filename = realloc(filename, sizeof(char) * len);
+ filename_tmp = realloc(filename, sizeof(*filename) * len);
- if (!filename) {
+ if (filename_tmp == NULL) {
+ free(filename);
perror("realloc");
goto out_dir;
}
+ filename = filename_tmp;
snprintf(filename, len - 1, "%s/benchmark_%s_%s_%li.log",
dirname, sysdata.nodename, sysdata.release, time(NULL));
} else {
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] cpupower: fix potential memory leak
2016-04-29 7:00 Thomas Renninger
@ 2016-05-05 23:37 ` Rafael J. Wysocki
0 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2016-05-05 23:37 UTC (permalink / raw)
To: Thomas Renninger; +Cc: rafael, linux-pm, arjun024
On Friday, April 29, 2016 09:00:14 AM Thomas Renninger wrote:
> From: Arjun Sreedharan <arjun024@gmail.com>
>
> Signed-off-by: Thomas Renninger <trenn@suse.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-05 23:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-14 7:59 [PATCH] cpupower: fix potential memory leak Arjun Sreedharan
-- strict thread matches above, loose matches on Subject: below --
2016-04-29 7:00 Thomas Renninger
2016-05-05 23:37 ` Rafael J. Wysocki
2015-08-22 12:01 Arjun Sreedharan
2015-09-11 19:51 ` Arjun Sreedharan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).