From: Donald Yandt <donald.ya...@gmail.com>

Return NULL instead of null-terminating version char array when fgets
fails due to end-of-file or error.

Signed-off-by: Donald Yandt <donald.ya...@gmail.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Yanmin Zhang <yanmin_zh...@linux.intel.com>
Fixes: 30ba5b0e66c8 ("perf machine: Null-terminate version char array upon 
fgets(/proc/version) error")
Link: http://lkml.kernel.org/r/20190528134128.30841-1-donald.ya...@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/machine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index f5569f005cf3..17eec39e775e 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1241,9 +1241,9 @@ static char *get_kernel_version(const char *root_dir)
                return NULL;
 
        tmp = fgets(version, sizeof(version), file);
-       if (!tmp)
-               *version = '\0';
        fclose(file);
+       if (!tmp)
+               return NULL;
 
        name = strstr(version, prefix);
        if (!name)
-- 
2.20.1

Reply via email to