From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933377AbdBPUAZ (ORCPT ); Thu, 16 Feb 2017 15:00:25 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48732 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933035AbdBPUAW (ORCPT ); Thu, 16 Feb 2017 15:00:22 -0500 Date: Thu, 16 Feb 2017 12:00:02 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dbueso@suse.de, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, mingo@kernel.org, hpa@zytor.com, jpoimboe@redhat.com, adrian.hunter@intel.com, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de Reply-To: adrian.hunter@intel.com, dsahern@gmail.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, wangnan0@huawei.com, dbueso@suse.de, jpoimboe@redhat.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib subcmd: Make it an error to pass a signed value to OPTION_UINTEGER Git-Commit-ID: b98897166280c4cfb9bc5a6c1b5682528eb4abff X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b98897166280c4cfb9bc5a6c1b5682528eb4abff Gitweb: http://git.kernel.org/tip/b98897166280c4cfb9bc5a6c1b5682528eb4abff Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 14 Feb 2017 13:55:40 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 14 Feb 2017 15:19:17 -0300 tools lib subcmd: Make it an error to pass a signed value to OPTION_UINTEGER Options marked OPTION_UINTEGER or OPTION_U64 clearly indicates that an unsigned value is expected, so just error out when a negative value is passed, instead of returning something undesired to the tool. E.g.: # perf bench futex hash -t -4 # Running 'futex/hash' benchmark: Error: switch `t' expects an unsigned numerical value Usage: perf bench futex hash -t, --threads Specify amount of threads # Cc: Adrian Hunter Cc: David Ahern Cc: Davidlohr Bueso Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-2mdn8s2raatyhz7tamrsz22r@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/subcmd/parse-options.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c index 8aad811..6bc2402 100644 --- a/tools/lib/subcmd/parse-options.c +++ b/tools/lib/subcmd/parse-options.c @@ -270,6 +270,8 @@ static int get_value(struct parse_opt_ctx_t *p, } if (get_arg(p, opt, flags, &arg)) return -1; + if (arg[0] == '-') + return opterror(opt, "expects an unsigned numerical value", flags); *(unsigned int *)opt->value = strtol(arg, (char **)&s, 10); if (*s) return opterror(opt, "expects a numerical value", flags); @@ -302,6 +304,8 @@ static int get_value(struct parse_opt_ctx_t *p, } if (get_arg(p, opt, flags, &arg)) return -1; + if (arg[0] == '-') + return opterror(opt, "expects an unsigned numerical value", flags); *(u64 *)opt->value = strtoull(arg, (char **)&s, 10); if (*s) return opterror(opt, "expects a numerical value", flags);