d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kvargs: be strict when matching a key

Browse Source 
When we match a key in is_valid_key() and rte_kvargs_process(), do a
strict 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".

Surprisingly, no patch was needed on rte_kvargs_count() as it already
used strcmp().

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Olivier Matz 2014-01-28 17:06:40 +01:00 committed by David Marchand
parent ac15c81315
commit d24839b318
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/librte_kvargs/rte_kvargs.c
View File

@ -94,9 +94,10 @@ is_valid_key(const char *valid[], const char *key_match)
{
const char **valid_ptr;
for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++)
if (strstr(key_match, *valid_ptr) != NULL)
for (valid_ptr = valid; *valid_ptr != NULL; valid_ptr++) {
if (strcmp(key_match, *valid_ptr) == 0)
return 1;
}
return 0;
}
@ -159,7 +160,7 @@ rte_kvargs_process(const struct rte_kvargs *kvlist,
for (i = 0; i < kvlist->count; i++) {
pair = &kvlist->pairs[i];
if (strstr(pair->key, key_match) != NULL) {
if (strcmp(pair->key, key_match) == 0) {
if ((*handler)(pair->value, opaque_arg) < 0)
return -1;
}