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 <tmri...@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

Reply via email to