Skip to content

Commit

Permalink
perf env: Do not return pointers to local variables
Browse files Browse the repository at this point in the history
commit ebcb946 upstream.

It is possible to return a pointer to a local variable when looking up
the architecture name for the running system and no normalization is
done on that value, i.e. we may end up returning the uts.machine local
variable.

While this doesn't happen on most arches, as normalization takes place,
lets fix this by making that a static variable and optimize it a bit by
not always running uname(), only the first time.

Noticed in fedora rawhide running with:

  [perfbuilder@a5ff49d6e6e4 ~]$ gcc --version
  gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8)

Reported-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Greg Kroah-Hartman committed Aug 5, 2020
1 parent 73d2d6b commit 702d1b2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/perf/util/env.c
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ static const char *normalize_arch(char *arch)

const char *perf_env__arch(struct perf_env *env)
{
struct utsname uts;
char *arch_name;

if (!env || !env->arch) { /* Assume local operation */
if (uname(&uts) < 0)
static struct utsname uts = { .machine[0] = '\0', };
if (uts.machine[0] == '\0' && uname(&uts) < 0)
return NULL;
arch_name = uts.machine;
} else
Expand Down

0 comments on commit 702d1b2

Please sign in to comment.