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 <[email protected]> > > wrote: > > > > From: Donald Yandt <[email protected]> > > > > 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 <[email protected]> > > Cc: Alexander Shishkin <[email protected]> > > Cc: Avi Kivity <[email protected]> > > Cc: Jiri Olsa <[email protected]> > > Cc: Peter Zijlstra <[email protected]> > > Cc: Yanmin Zhang <[email protected]> > > Fixes: a1645ce12adb ("perf: 'perf kvm' tool for monitoring guest > > performance from host") > > Link: http://lkml.kernel.org/r/[email protected] > > Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> > > --- > > 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
