Re: [PATCH 20/73] perf machine: Null-terminate version char array upon fgets(/proc/version) error

[Arnaldo Carvalho de Melo]

Em Fri, May 17, 2019 at 08:05:39PM -0400, Donald Yandt escreveu:
> Thank you Arnaldo for signing my patch.
> 
>      I think we should use version 4 of my patch and return NULL instead of null-terminating for efficiency.

Please resubmit then, v3 is already upstream.

- Arnaldo
 
> Thanks,
> 
> Donald
> 
> > On May 17, 2019, at 3:35 PM, Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
> > 
> > From: Donald Yandt <donald.yandt@xxxxxxxxx>
> > 
> > If fgets() fails due to any other error besides end-of-file, the version
> > char array may not even be null-terminated.
> > 
> > Signed-off-by: Donald Yandt <donald.yandt@xxxxxxxxx>
> > Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> > Cc: Avi Kivity <avi@xxxxxxxxxxxx>
> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> > Cc: Yanmin Zhang <yanmin_zhang@xxxxxxxxxxxxxxx>
> > Fixes: a1645ce12adb ("perf: 'perf kvm' tool for monitoring guest performance from host")
> > Link: http://lkml.kernel.org/r/20190514110100.22019-1-donald.yandt@xxxxxxxxx
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > ---
> > tools/perf/util/machine.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> > index 3c520baa198c..28a9541c4835 100644
> > --- a/tools/perf/util/machine.c
> > +++ b/tools/perf/util/machine.c
> > @@ -1234,8 +1234,9 @@ static char *get_kernel_version(const char *root_dir)
> >    if (!file)
> >        return NULL;
> > 
> > -    version[0] = '\0';
> >    tmp = fgets(version, sizeof(version), file);
> > +    if (!tmp)
> > +        *version = '\0';
> >    fclose(file);
> > 
> >    name = strstr(version, prefix);
> > -- 
> > 2.20.1
> > 

-- 

- Arnaldo