lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1464074252-21991-2-git-send-email-treeze.taeung@gmail.com> Date: Tue, 24 May 2016 16:17:28 +0900 From: Taeung Song <treeze.taeung@...il.com> To: Arnaldo Carvalho de Melo <acme@...nel.org> Cc: linux-kernel@...r.kernel.org, Jiri Olsa <jolsa@...nel.org>, Namhyung Kim <namhyung@...nel.org>, Ingo Molnar <mingo@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Masami Hiramatsu <mhiramat@...nel.org>, Taeung Song <treeze.taeung@...il.com>, Jiri Olsa <jolsa@...hat.com> Subject: [PATCH v2 1/5] perf config: Use new perf_config_set__init() to initialize config set Instead of perf_config(), This function initialize config set collecting all configs from config files (i.e. user config ~/.perfconfig and system config $(sysconfdir)/perfconfig). If there are the same config variable both user and system config file, user config has higher priority than system config. Cc: Namhyung Kim <namhyung@...nel.org> Cc: Jiri Olsa <jolsa@...hat.com> Cc: Masami Hiramatsu <mhiramat@...nel.org> Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com> Signed-off-by: Taeung Song <treeze.taeung@...il.com> --- tools/perf/util/config.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index dad7d82..5d01899 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -645,13 +645,61 @@ out_free: return -1; } +static int perf_config_set__init(struct perf_config_set *set) +{ + int ret = 0, found = 0; + const char *home = NULL; + + /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */ + if (config_exclusive_filename) + return perf_config_from_file(collect_config, config_exclusive_filename, set); + if (perf_config_system() && !access(perf_etc_perfconfig(), R_OK)) { + ret += perf_config_from_file(collect_config, perf_etc_perfconfig(), set); + found += 1; + } + + home = getenv("HOME"); + if (perf_config_global() && home) { + char *user_config = strdup(mkpath("%s/.perfconfig", home)); + struct stat st; + + if (user_config == NULL) { + warning("Not enough memory to process %s/.perfconfig, " + "ignoring it.", home); + goto out; + } + + if (stat(user_config, &st) < 0) + goto out_free; + + if (st.st_uid && (st.st_uid != geteuid())) { + warning("File %s not owned by current user or root, " + "ignoring it.", user_config); + goto out_free; + } + + if (!st.st_size) + goto out_free; + + ret += perf_config_from_file(collect_config, user_config, set); + found += 1; +out_free: + free(user_config); + } +out: + if (found == 0) + return -1; + return ret; +} + struct perf_config_set *perf_config_set__new(void) { struct perf_config_set *set = zalloc(sizeof(*set)); if (set) { INIT_LIST_HEAD(&set->sections); - perf_config(collect_config, set); + if (perf_config_set__init(set) < 0) + return NULL; } return set; -- 2.5.0
Powered by blists - more mailing lists