* [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads
@ 2013-06-06 11:35 Kirill A. Shutemov
2013-06-06 14:06 ` Hitoshi Mitake
2013-07-12 8:49 ` [tip:perf/urgent] perf bench: Fix " tip-bot for Kirill A. Shutemov
0 siblings, 2 replies; 3+ messages in thread
From: Kirill A. Shutemov @ 2013-06-06 11:35 UTC (permalink / raw)
To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Hitoshi Mitake
Cc: linux-kernel, Kirill A. Shutemov
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
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 <kirill.shutemov@linux.intel.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads
2013-06-06 11:35 [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads Kirill A. Shutemov
@ 2013-06-06 14:06 ` Hitoshi Mitake
2013-07-12 8:49 ` [tip:perf/urgent] perf bench: Fix " tip-bot for Kirill A. Shutemov
1 sibling, 0 replies; 3+ messages in thread
From: Hitoshi Mitake @ 2013-06-06 14:06 UTC (permalink / raw)
To: Kirill A. Shutemov
Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
Arnaldo Carvalho de Melo, Hitoshi Mitake, linux-kernel,
mitake.hitoshi
Hi Kirill,
At Thu, 6 Jun 2013 14:35:03 +0300,
Kirill A. Shutemov wrote:
>
> From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
>
> 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 <mitake.hitoshi@lab.ntt.co.jp>
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/urgent] perf bench: Fix memory allocation fail check in mem{set,cpy} workloads
2013-06-06 11:35 [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads Kirill A. Shutemov
2013-06-06 14:06 ` Hitoshi Mitake
@ 2013-07-12 8:49 ` tip-bot for Kirill A. Shutemov
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Kirill A. Shutemov @ 2013-07-12 8:49 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, paulus, mingo, hpa, mingo, a.p.zijlstra,
kirill.shutemov, h.mitake, mitake.hitoshi, tglx
Commit-ID: 13966721a11f4a2ba8038191e48083b5f31822bb
Gitweb: http://git.kernel.org/tip/13966721a11f4a2ba8038191e48083b5f31822bb
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Thu, 6 Jun 2013 14:35:03 +0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <kirill.shutemov@linux.intel.com>
Acked-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Cc: Hitoshi Mitake <h.mitake@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1370518503-4230-1-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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");
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-12 8:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-06 11:35 [PATCH] perf bench: fix memory allocation fail check in mem{set,cpy} workloads Kirill A. Shutemov
2013-06-06 14:06 ` Hitoshi Mitake
2013-07-12 8:49 ` [tip:perf/urgent] perf bench: Fix " tip-bot for Kirill A. Shutemov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.