From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id E28B62BF5; Tue, 25 Apr 2017 05:11:03 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Apr 2017 20:11:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,247,1488873600"; d="scan'208";a="1139719041" Received: from dpdk26.sh.intel.com ([10.239.128.228]) by fmsmga001.fm.intel.com with ESMTP; 24 Apr 2017 20:11:01 -0700 From: Wenzhuo Lu To: dev@dpdk.org Cc: olivier.matz@6wind.com, Wenzhuo Lu , stable@dpdk.org Date: Tue, 25 Apr 2017 11:11:25 +0800 Message-Id: <1493089885-94889-1-git-send-email-wenzhuo.lu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dpdk-stable] [PATCH] lib/librte_cmdline: fix CLI parsing issue X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2017 03:11:04 -0000 When parsing a CLI, all the CLI instances are checked one by one. Even if an instance already matches the CLI, the parsing will not stop for ambiguous check. The problem is that the following check may change the parsing result of the previous one even if the following instance doesn't match. Use a temporary validate for the parsing result when trying to match an instance and only store the result when it matches, so the previous result has no chance to be changed. Fixes: af75078fece3 ("first public release") CC: stable@dpdk.org Signed-off-by: Wenzhuo Lu --- lib/librte_cmdline/cmdline_parse.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c index 763c286..b814880 100644 --- a/lib/librte_cmdline/cmdline_parse.c +++ b/lib/librte_cmdline/cmdline_parse.c @@ -258,7 +258,7 @@ union { char buf[CMDLINE_PARSE_RESULT_BUFSIZE]; long double align; /* strong alignment constraint for buf */ - } result; + } result, tmp_result; cmdline_parse_token_hdr_t *dyn_tokens[CMDLINE_PARSE_DYNAMIC_TOKENS]; void (*f)(void *, struct cmdline *, void *) = NULL; void *data = NULL; @@ -321,14 +321,16 @@ debug_printf("INST %d\n", inst_num); /* fully parsed */ - tok = match_inst(inst, buf, 0, result.buf, sizeof(result.buf), - &dyn_tokens); + tok = match_inst(inst, buf, 0, tmp_result.buf, + sizeof(tmp_result.buf), &dyn_tokens); if (tok > 0) /* we matched at least one token */ err = CMDLINE_PARSE_BAD_ARGS; else if (!tok) { debug_printf("INST fully parsed\n"); + memcpy(&result, &tmp_result, + sizeof(result)); /* skip spaces */ while (isblank2(*curbuf)) { curbuf++; -- 1.9.3