* [PATCH] perf s390: Fix reading cpuid model information
@ 2018-02-19 10:24 Thomas Richter
2018-02-19 12:13 ` Arnaldo Carvalho de Melo
2018-02-21 10:25 ` [tip:perf/core] " tip-bot for Thomas Richter
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Richter @ 2018-02-19 10:24 UTC (permalink / raw)
To: linux-kernel, linux-perf-users, acme
Cc: brueckner, schwidefsky, heiko.carstens, Thomas Richter
Commit feb3d2d955c8 (perf record: Provide detailed information
on s390 CPU") fixed a build error on Ubuntu. However the
fix uses the wrong size to print the model information.
Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c
index 231294b80dc4..a4c30f1c70be 100644
--- a/tools/perf/arch/s390/util/header.c
+++ b/tools/perf/arch/s390/util/header.c
@@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz)
line2 = line + strlen(SYSINFO_MODEL);
while ((cp = strtok_r(line2, "\n ", &line2))) {
- mdsize += scnprintf(model + mdsize, sizeof(type) - mdsize,
+ mdsize += scnprintf(model + mdsize, sizeof(model) - mdsize,
"%s%s", model[0] ? "," : "", cp);
}
break;
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf s390: Fix reading cpuid model information
2018-02-19 10:24 [PATCH] perf s390: Fix reading cpuid model information Thomas Richter
@ 2018-02-19 12:13 ` Arnaldo Carvalho de Melo
2018-02-21 10:25 ` [tip:perf/core] " tip-bot for Thomas Richter
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2018-02-19 12:13 UTC (permalink / raw)
To: Thomas Richter
Cc: linux-kernel, linux-perf-users, brueckner, schwidefsky, heiko.carstens
Em Mon, Feb 19, 2018 at 11:24:44AM +0100, Thomas Richter escreveu:
> Commit feb3d2d955c8 (perf record: Provide detailed information
> on s390 CPU") fixed a build error on Ubuntu. However the
> fix uses the wrong size to print the model information.
Thanks for the review and quick fix, I'm sorry for letting that slip :-\
sizeof(type) is smaller tha sizeof(model), so at least this would just
limit the formatted model variable to be at most sizeof(type) in lenght.
Anyway, applying the fix :-)
- Arnaldo
> Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
> ---
> tools/perf/arch/s390/util/header.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c
> index 231294b80dc4..a4c30f1c70be 100644
> --- a/tools/perf/arch/s390/util/header.c
> +++ b/tools/perf/arch/s390/util/header.c
> @@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz)
> line2 = line + strlen(SYSINFO_MODEL);
>
> while ((cp = strtok_r(line2, "\n ", &line2))) {
> - mdsize += scnprintf(model + mdsize, sizeof(type) - mdsize,
> + mdsize += scnprintf(model + mdsize, sizeof(model) - mdsize,
> "%s%s", model[0] ? "," : "", cp);
> }
> break;
> --
> 2.14.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:perf/core] perf s390: Fix reading cpuid model information
2018-02-19 10:24 [PATCH] perf s390: Fix reading cpuid model information Thomas Richter
2018-02-19 12:13 ` Arnaldo Carvalho de Melo
@ 2018-02-21 10:25 ` tip-bot for Thomas Richter
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Thomas Richter @ 2018-02-21 10:25 UTC (permalink / raw)
To: linux-tip-commits
Cc: brueckner, schwidefsky, hpa, mingo, acme, heiko.carstens,
linux-kernel, tmricht, tglx
Commit-ID: 47812e00910407a0f14906c0a3bf2d803a616c6f
Gitweb: https://git.kernel.org/tip/47812e00910407a0f14906c0a3bf2d803a616c6f
Author: Thomas Richter <tmricht@linux.vnet.ibm.com>
AuthorDate: Mon, 19 Feb 2018 11:24:44 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 19 Feb 2018 09:16:01 -0300
perf s390: Fix reading cpuid model information
Commit eca0fa28cd0d (perf record: Provide detailed information on s390
CPU") fixed a build error on Ubuntu. However the fix uses the wrong
size to print the model information.
Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU")
Link: http://lkml.kernel.org/r/20180219102444.96900-1-tmricht@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c
index 231294b..a4c30f1 100644
--- a/tools/perf/arch/s390/util/header.c
+++ b/tools/perf/arch/s390/util/header.c
@@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz)
line2 = line + strlen(SYSINFO_MODEL);
while ((cp = strtok_r(line2, "\n ", &line2))) {
- mdsize += scnprintf(model + mdsize, sizeof(type) - mdsize,
+ mdsize += scnprintf(model + mdsize, sizeof(model) - mdsize,
"%s%s", model[0] ? "," : "", cp);
}
break;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-21 10:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-19 10:24 [PATCH] perf s390: Fix reading cpuid model information Thomas Richter
2018-02-19 12:13 ` Arnaldo Carvalho de Melo
2018-02-21 10:25 ` [tip:perf/core] " tip-bot for Thomas Richter
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).