hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf tools: Do parameter validation earlier on fetch_kernel_version() 

While trying to reduce util.[ch] I noticed that fetch_kernel_version()
and fetch_ubuntu_kernel_version() do lots of operations only to check if
they are needed, i.e. it checks if the pointer where to return the
kernel version is NULL only after obtaining the kernel version from
/proc/version_signature or by parsing the results from uname().

Do it earlier not to confuse people reading this code in the future :-)

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-i94qwyekk4tzbu0b9ce1r1mz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2017-06-20 12:19:16 -03:00
parent 2157f6ee18
commit 44b58e06e8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/perf/util/util.c
View File

@ -350,8 +350,12 @@ fetch_ubuntu_kernel_version(unsigned int *puint)
size_t line_len = 0; size_t line_len = 0;
char *ptr, *line = NULL; char *ptr, *line = NULL;
int version, patchlevel, sublevel, err; int version, patchlevel, sublevel, err;
FILE *vsig = fopen("/proc/version_signature", "r"); FILE *vsig;
if (!puint)
return 0;
vsig = fopen("/proc/version_signature", "r");
if (!vsig) { if (!vsig) {
pr_debug("Open /proc/version_signature failed: %s\n", pr_debug("Open /proc/version_signature failed: %s\n",
strerror(errno)); strerror(errno));
@ -381,8 +385,7 @@ fetch_ubuntu_kernel_version(unsigned int *puint)
goto errout; goto errout;
} }
if (puint) *puint = (version << 16) + (patchlevel << 8) + sublevel;
*puint = (version << 16) + (patchlevel << 8) + sublevel;
err = 0; err = 0;
errout: errout:
free(line); free(line);
@ -409,6 +412,9 @@ fetch_kernel_version(unsigned int *puint, char *str,
str[str_size - 1] = '\0'; str[str_size - 1] = '\0';
} }
if (!puint || int_ver_ready)
return 0;
err = sscanf(utsname.release, "%d.%d.%d", err = sscanf(utsname.release, "%d.%d.%d",
&version, &patchlevel, &sublevel); &version, &patchlevel, &sublevel);
@ -418,8 +424,7 @@ fetch_kernel_version(unsigned int *puint, char *str,
return -1; return -1;
} }
if (puint && !int_ver_ready) *puint = (version << 16) + (patchlevel << 8) + sublevel;
*puint = (version << 16) + (patchlevel << 8) + sublevel;
return 0; return 0;
} }