kvargs: fix invalid token parsing on FreeBSD
The behavior of strtok_r() is not the same between GNU libc and FreeBSD libc: in the first case, the context is set to "" when the last token is returned, while in the second case it is set to NULL. On FreeBSD, the current code crashes because we are dereferencing a NULL pointer (ctx1). Fix it by first checking if it is NULL. This works with both GNU and FreeBSD libc. Fixes: ffcf831454a9 ("kvargs: fix buffer overflow when parsing list") Cc: stable@dpdk.org Signed-off-by: Olivier Matz <olivier.matz@6wind.com> Tested-by: Zhimin Huang <zhiminx.huang@intel.com>
This commit is contained in:
parent
b2f8a22e79
commit
b2aa2c9723
@ -50,7 +50,7 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params)
|
||||
/* Find the end of the list. */
|
||||
while (str[strlen(str) - 1] != ']') {
|
||||
/* Restore the comma erased by strtok_r(). */
|
||||
if (ctx1[0] == '\0')
|
||||
if (ctx1 == NULL || ctx1[0] == '\0')
|
||||
return -1; /* no closing bracket */
|
||||
str[strlen(str)] = ',';
|
||||
/* Parse until next comma. */
|
||||
|
Loading…
x
Reference in New Issue
Block a user