Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1385866 > unrolled thread
| Started by | Colin King <colin.king@canonical.com> |
|---|---|
| First post | 2016-04-24 21:00 +0200 |
| Last post | 2016-04-27 17:40 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] perf tools: fix off-by-one comparison on maximum code Colin King <colin.king@canonical.com> - 2016-04-24 21:00 +0200
Re: [PATCH] perf tools: fix off-by-one comparison on maximum code Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 01:30 +0200
[tip:perf/core] perf intel-pt: Fix off-by-one comparison on maximum code tip-bot for Colin Ian King <tipbot@zytor.com> - 2016-04-27 17:40 +0200
| From | Colin King <colin.king@canonical.com> |
|---|---|
| Date | 2016-04-24 21:00 +0200 |
| Subject | [PATCH] perf tools: fix off-by-one comparison on maximum code |
| Message-ID | <rrxq9-KK-1@gated-at.bofh.it> |
From: Colin Ian King <colin.king@canonical.com>
The check for the maximum code is off-by-one; the current
comparison of a code that is INTEL_PT_ERR_MAX will cause the
strlcpy to perform an out of bounds array access on the
intel_pt_err_msgs array. Fix this with a >= comparison.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 9409d01..9c8f15d 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -356,7 +356,7 @@ static const char *intel_pt_err_msgs[] = {
int intel_pt__strerror(int code, char *buf, size_t buflen)
{
- if (code < 1 || code > INTEL_PT_ERR_MAX)
+ if (code < 1 || code >= INTEL_PT_ERR_MAX)
code = INTEL_PT_ERR_UNK;
strlcpy(buf, intel_pt_err_msgs[code], buflen);
return 0;
--
2.7.4
[toc] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2016-04-26 01:30 +0200 |
| Message-ID | <rrY70-5UY-17@gated-at.bofh.it> |
| In reply to | #1385866 |
Em Sun, Apr 24, 2016 at 07:56:43PM +0100, Colin King escreveu:
> From: Colin Ian King <colin.king@canonical.com>
>
> The check for the maximum code is off-by-one; the current
> comparison of a code that is INTEL_PT_ERR_MAX will cause the
> strlcpy to perform an out of bounds array access on the
> intel_pt_err_msgs array. Fix this with a >= comparison.
Applied, thanks.
- Arnaldo
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
> index 9409d01..9c8f15d 100644
> --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
> +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
> @@ -356,7 +356,7 @@ static const char *intel_pt_err_msgs[] = {
>
> int intel_pt__strerror(int code, char *buf, size_t buflen)
> {
> - if (code < 1 || code > INTEL_PT_ERR_MAX)
> + if (code < 1 || code >= INTEL_PT_ERR_MAX)
> code = INTEL_PT_ERR_UNK;
> strlcpy(buf, intel_pt_err_msgs[code], buflen);
> return 0;
> --
> 2.7.4
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Colin Ian King <tipbot@zytor.com> |
|---|---|
| Date | 2016-04-27 17:40 +0200 |
| Subject | [tip:perf/core] perf intel-pt: Fix off-by-one comparison on maximum code |
| Message-ID | <rszJf-3tA-5@gated-at.bofh.it> |
| In reply to | #1385866 |
Commit-ID: c0664893050cc6b2d8b02d3e035f82fbfd0cd4cf
Gitweb: http://git.kernel.org/tip/c0664893050cc6b2d8b02d3e035f82fbfd0cd4cf
Author: Colin Ian King <colin.king@canonical.com>
AuthorDate: Sun, 24 Apr 2016 19:56:43 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 25 Apr 2016 20:35:59 -0300
perf intel-pt: Fix off-by-one comparison on maximum code
The check for the maximum code is off-by-one; the current comparison of
a code that is INTEL_PT_ERR_MAX will cause the strlcpy to perform an out
of bounds array access on the intel_pt_err_msgs array.
Fix this with a >= comparison.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1461524203-10224-1-git-send-email-colin.king@canonical.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 9409d01..9c8f15d 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -356,7 +356,7 @@ static const char *intel_pt_err_msgs[] = {
int intel_pt__strerror(int code, char *buf, size_t buflen)
{
- if (code < 1 || code > INTEL_PT_ERR_MAX)
+ if (code < 1 || code >= INTEL_PT_ERR_MAX)
code = INTEL_PT_ERR_UNK;
strlcpy(buf, intel_pt_err_msgs[code], buflen);
return 0;
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web