From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6A63B58EB for ; Thu, 30 Jan 2014 12:22:26 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 30 Jan 2014 03:23:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,749,1384329600"; d="scan'208";a="473182700" Received: from irsmsx103.ger.corp.intel.com ([163.33.3.157]) by fmsmga002.fm.intel.com with ESMTP; 30 Jan 2014 03:23:43 -0800 Received: from irsmsx152.ger.corp.intel.com (163.33.192.66) by IRSMSX103.ger.corp.intel.com (163.33.3.157) with Microsoft SMTP Server (TLS) id 14.3.123.3; Thu, 30 Jan 2014 11:23:43 +0000 Received: from irsmsx103.ger.corp.intel.com ([169.254.3.84]) by IRSMSX152.ger.corp.intel.com ([163.33.192.66]) with mapi id 14.03.0123.003; Thu, 30 Jan 2014 11:23:43 +0000 From: "Richardson, Bruce" To: Olivier Matz , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH 07/11] kvargs: be strict when matching a key Thread-Index: AQHPHENM8iYG9G9OkkWxe9W+yjjTApqdIt9Q Date: Thu, 30 Jan 2014 11:23:42 +0000 Message-ID: <59AF69C657FD0841A61C55336867B5B01A995FC9@IRSMSX103.ger.corp.intel.com> References: <1390925204-10800-1-git-send-email-olivier.matz@6wind.com> <1390925204-10800-8-git-send-email-olivier.matz@6wind.com> In-Reply-To: <1390925204-10800-8-git-send-email-olivier.matz@6wind.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH 07/11] kvargs: be strict when matching a key X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2014 11:22:26 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Olivier Matz > Sent: Tuesday, January 28, 2014 4:07 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH 07/11] kvargs: be strict when matching a key >=20 > When we match a key in is_valid_key() and rte_kvargs_process(), do a stri= ct > comparison (strcmp()) instead of using strstr(s1, s2) which tries a find = s1 in > s2. This old behavior could lead to unexpected match, for instance "cola" > match "chocolate". >=20 > Surprisingly, no patch was needed on rte_kvargs_count() as it already use= d > strcmp(). >=20 > Signed-off-by: Olivier Matz > --- > lib/librte_kvargs/rte_kvargs.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvarg= s.c > index 6aaa316..73034fc 100644 > --- a/lib/librte_kvargs/rte_kvargs.c > +++ b/lib/librte_kvargs/rte_kvargs.c > @@ -94,9 +94,10 @@ is_valid_key(const char *valid[], const char > *key_match) { > const char **valid_ptr; >=20 > - for (valid_ptr =3D valid; *valid_ptr !=3D NULL; valid_ptr++) > - if (strstr(key_match, *valid_ptr) !=3D NULL) > + for (valid_ptr =3D valid; *valid_ptr !=3D NULL; valid_ptr++) { > + if (strcmp(key_match, *valid_ptr) =3D=3D 0) > return 1; > + } > return 0; > } >=20 > @@ -159,7 +160,7 @@ rte_kvargs_process(const struct rte_kvargs *kvlist, >=20 > for (i =3D 0; i < kvlist->count; i++) { > pair =3D &kvlist->pairs[i]; > - if (strstr(pair->key, key_match) !=3D NULL) { > + if (strcmp(pair->key, key_match) =3D=3D 0) { > if ((*handler)(pair->value, opaque_arg) < 0) > return -1; > } > -- > 1.8.4.rc3 Acked-by: Bruce Richardson