2013-06-06 11:32:37

by Kirill A. Shutemov

Subject: [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads

From: "Kirill A. Shutemov" <[email protected]>

Addresses of allocated memory areas saved to '*src' and '*dst', so we
need to check them for NULL, not 'src' and 'dst'.

Signed-off-by: Kirill A. Shutemov <[email protected]>
---
tools/perf/bench/mem-memcpy.c | 4 ++--
tools/perf/bench/mem-memset.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c
index 93c83e3..25fd3f1 100644
--- a/tools/perf/bench/mem-memcpy.c
+++ b/tools/perf/bench/mem-memcpy.c
@@ -111,11 +111,11 @@ static double timeval2double(struct timeval *ts)
static void alloc_mem(void **dst, void **src, size_t length)
{
*dst = zalloc(length);
- if (!dst)
+ if (!*dst)
die("memory allocation failed - maybe length is too large?\n");

*src = zalloc(length);
- if (!src)
+ if (!*src)
die("memory allocation failed - maybe length is too large?\n");
}

diff --git a/tools/perf/bench/mem-memset.c b/tools/perf/bench/mem-memset.c
index c6e4bc5..4a2f120 100644
--- a/tools/perf/bench/mem-memset.c
+++ b/tools/perf/bench/mem-memset.c
@@ -111,7 +111,7 @@ static double timeval2double(struct timeval *ts)
static void alloc_mem(void **dst, size_t length)
{
*dst = zalloc(length);
- if (!dst)
+ if (!*dst)
die("memory allocation failed - maybe length is too large?\n");
}

--
1.7.10.4

2013-06-06 14:06:15

by Hitoshi Mitake

Subject: Re: [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads

Hi Kirill,

At Thu, 6 Jun 2013 14:35:03 +0300,
Kirill A. Shutemov wrote:
>
> From: "Kirill A. Shutemov" <[email protected]>
>
> Addresses of allocated memory areas saved to '*src' and '*dst', so we
> need to check them for NULL, not 'src' and 'dst'.

Thanks for your fix, this is my mistake.
Acked-by: Hitoshi Mitake <[email protected]>

>
> Signed-off-by: Kirill A. Shutemov <[email protected]>
> ---
> tools/perf/bench/mem-memcpy.c | 4 ++--
> tools/perf/bench/mem-memset.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c
> index 93c83e3..25fd3f1 100644
> --- a/tools/perf/bench/mem-memcpy.c
> +++ b/tools/perf/bench/mem-memcpy.c
> @@ -111,11 +111,11 @@ static double timeval2double(struct timeval *ts)
> static void alloc_mem(void **dst, void **src, size_t length)
> {
> *dst = zalloc(length);
> - if (!dst)
> + if (!*dst)
> die("memory allocation failed - maybe length is too large?\n");
>
> *src = zalloc(length);
> - if (!src)
> + if (!*src)
> die("memory allocation failed - maybe length is too large?\n");
> }
>
> diff --git a/tools/perf/bench/mem-memset.c b/tools/perf/bench/mem-memset.c
> index c6e4bc5..4a2f120 100644
> --- a/tools/perf/bench/mem-memset.c
> +++ b/tools/perf/bench/mem-memset.c
> @@ -111,7 +111,7 @@ static double timeval2double(struct timeval *ts)
> static void alloc_mem(void **dst, size_t length)
> {
> *dst = zalloc(length);
> - if (!dst)
> + if (!*dst)
> die("memory allocation failed - maybe length is too large?\n");
> }
>
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2013-07-12 08:50:36

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/urgent] perf bench: Fix memory allocation fail check in mem{set,cpy} workloads

Commit-ID: 13966721a11f4a2ba8038191e48083b5f31822bb
Gitweb: http://git.kernel.org/tip/13966721a11f4a2ba8038191e48083b5f31822bb
Author: Kirill A. Shutemov <[email protected]>
AuthorDate: Thu, 6 Jun 2013 14:35:03 +0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 8 Jul 2013 17:35:40 -0300

perf bench: Fix memory allocation fail check in mem{set,cpy} workloads

Addresses of allocated memory areas saved to '*src' and '*dst', so we
need to check them for NULL, not 'src' and 'dst'.

Signed-off-by: Kirill A. Shutemov <[email protected]>
Acked-by: Hitoshi Mitake <[email protected]>
Cc: Hitoshi Mitake <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/bench/mem-memcpy.c | 4 ++--
tools/perf/bench/mem-memset.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/bench/mem-memcpy.c b/tools/perf/bench/mem-memcpy.c
index 93c83e3..25fd3f1 100644
--- a/tools/perf/bench/mem-memcpy.c
+++ b/tools/perf/bench/mem-memcpy.c
@@ -111,11 +111,11 @@ static double timeval2double(struct timeval *ts)
static void alloc_mem(void **dst, void **src, size_t length)
{
*dst = zalloc(length);
- if (!dst)
+ if (!*dst)
die("memory allocation failed - maybe length is too large?\n");

*src = zalloc(length);
- if (!src)
+ if (!*src)
die("memory allocation failed - maybe length is too large?\n");
}

diff --git a/tools/perf/bench/mem-memset.c b/tools/perf/bench/mem-memset.c
index c6e4bc5..4a2f120 100644
--- a/tools/perf/bench/mem-memset.c
+++ b/tools/perf/bench/mem-memset.c
@@ -111,7 +111,7 @@ static double timeval2double(struct timeval *ts)
static void alloc_mem(void **dst, size_t length)
{
*dst = zalloc(length);
- if (!dst)
+ if (!*dst)
die("memory allocation failed - maybe length is too large?\n");
}