From 01abf7ee37702407403afcf9aa6c9019a0316e1d Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Thu, 17 Aug 2017 10:54:02 +0530 Subject: glusterd: disallow volume specific options to be set with all as volume name All the .validate_fn defined in volume map entry table refers to volinfo object. And if we end up in trying to set a volume level option cluster wide glusterd results into a crash. Change-Id: I7c877aee0ff5c8c1d8c95662fdc8c8923355ae7b BUG: 1482344 Signed-off-by: Atin Mukherjee Reviewed-on: https://review.gluster.org/18052 Smoke: Gluster Build System Reviewed-by: Prashanth Pai Reviewed-by: mohammed rafi kc Reviewed-by: Gaurav Yadav CentOS-regression: Gluster Build System --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 410885e82de..69629f201aa 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -807,6 +807,14 @@ glusterd_volopt_validate (glusterd_volinfo_t *volinfo, dict_t *dict, char *key, if ((vme->validate_fn) && ((!strcmp (key, vme->key)) || (!strcmp (key, strchr (vme->key, '.') + 1)))) { + if ((vme->type != GLOBAL_DOC && + vme->type != GLOBAL_NO_DOC) && !volinfo) { + gf_msg (this->name, GF_LOG_ERROR, 0, + GD_MSG_INVALID_ENTRY, "%s is not" + " a global option", vme->key); + ret = -1; + goto out; + } ret = vme->validate_fn (volinfo, dict, key, value, op_errstr); if (ret) -- cgit