summaryrefslogtreecommitdiffstats
path: root/cli/src/cli-cmd-parser.c
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2015-04-01 16:56:00 +0530
committerVijay Bellur <vbellur@redhat.com>2015-04-10 11:21:48 +0000
commitd06e6bac4b5aa6d0fbf1660b92c4100de8f79e68 (patch)
tree106e47847a88aab96c284b8e3b6aa1c2feffe3e8 /cli/src/cli-cmd-parser.c
parentfcb55d54a62c8d4a2e8ce4596cd462c471f74dd3 (diff)
quota/cli: validate quota hard-limit option
Quota hard-limit is supported only upto: 9223372036854775807 (int 64) In CLI, it is allowed to set the value upto 16384PB (unsigned int 64), this is not a valid value as the xattrop for quota accounting and the quota enforcer operates on a signed int64 limit value. This patches fixes the problem in CLI and allows user to set the hard-limit value only from range 0 - 9223372036854775807 Change-Id: Ifce6e509e1832ef21d3278bacfa5bd71040c8cba BUG: 1206432 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/10022 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushal M <kaushal@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'cli/src/cli-cmd-parser.c')
-rw-r--r--cli/src/cli-cmd-parser.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index da60cde66d9..a8e09a46631 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -906,7 +906,7 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
int ret = -1;
int i = -1;
char key[20] = {0, };
- uint64_t value = 0;
+ int64_t value = 0;
gf_quota_type type = GF_QUOTA_OPTION_TYPE_NONE;
char *opwords[] = { "enable", "disable", "limit-usage",
"remove", "list", "alert-time",
@@ -1004,11 +1004,12 @@ cli_cmd_quota_parse (const char **words, int wordcount, dict_t **options)
}
if (type == GF_QUOTA_OPTION_TYPE_LIMIT_USAGE) {
- ret = gf_string2bytesize_uint64 (words[5], &value);
- if (ret != 0) {
- if (errno == ERANGE)
- cli_err ("Value too large: %s",
- words[5]);
+ ret = gf_string2bytesize_int64 (words[5], &value);
+ if (ret != 0 || value < 0) {
+ if (errno == ERANGE || value < 0)
+ cli_err ("Value out of range "
+ "(0 - %"PRId64 "): %s",
+ INT64_MAX, words[5]);
else
cli_err ("Please enter a correct "
"value");