aaa662e75c
When using test-pmd with flow director in FreeBSD, the application will segfault/Bus error while parsing the command-line. This is due to how each commands result structure is represented during parsing, where the offsets for each tokens value is stored in a character array(char result_buf[BUFSIZ]) in cmdline_parse()(./lib/librte_cmdline/cmdline_parse.c). The overflow occurs where BUFSIZ is less than the size of a commands result structure, in this case "struct cmd_pkt_filter_result" (app/test-pmd/cmdline.c) is 1088 bytes and BUFSIZ on FreeBSD is 1024 bytes as opposed to 8192 bytes on Linux. The problem can be reproduced by running test-pmd on FreeBSD: ./testpmd -c 0x3 -n 4 -- -i --portmask=0x3 --pkt-filter-mode=perfect And adding a filter: add_perfect_filter 0 udp src 192.168.0.0 1024 dst 192.168.0.0 1024 flexbytes 0x800 vlan 0 queue 0 soft 0x17 This patch removes the OS dependency on BUFSIZ and defines and uses a library #define CMDLINE_PARSE_RESULT_BUFSIZE 8192 Added boundary checking to ensure this buffer size cannot overflow, with an error message being produced. Suggested-by: Olivier Matz <olivier.matz@6wind.com> http://git.droids-corp.org/?p=libcmdline.git;a=commitdiff;h=b1d5b169352e57df3fc14c51ffad4b83f3e5613f Signed-off-by: Alan Carew <alan.carew@intel.com> Signed-off-by: Olivier Matz <olivier.matz@6wind.com> Tested-by: Bruce Richardson <bruce.richardson@intel.com>
254 lines
6.7 KiB
C
254 lines
6.7 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 2009, Olivier MATZ <zer0@droids-corp.org>
|
|
* All rights reserved.
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of the University of California, Berkeley nor the
|
|
* names of its contributors may be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
|
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <inttypes.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
#include <errno.h>
|
|
#include <rte_string_fns.h>
|
|
|
|
#include "cmdline_parse.h"
|
|
#include "cmdline_parse_string.h"
|
|
|
|
struct cmdline_token_ops cmdline_token_string_ops = {
|
|
.parse = cmdline_parse_string,
|
|
.complete_get_nb = cmdline_complete_get_nb_string,
|
|
.complete_get_elt = cmdline_complete_get_elt_string,
|
|
.get_help = cmdline_get_help_string,
|
|
};
|
|
|
|
#define MULTISTRING_HELP "Mul-choice STRING"
|
|
#define ANYSTRING_HELP "Any STRING"
|
|
#define FIXEDSTRING_HELP "Fixed STRING"
|
|
|
|
static unsigned int
|
|
get_token_len(const char *s)
|
|
{
|
|
char c;
|
|
unsigned int i=0;
|
|
|
|
c = s[i];
|
|
while (c!='#' && c!='\0') {
|
|
i++;
|
|
c = s[i];
|
|
}
|
|
return i;
|
|
}
|
|
|
|
static const char *
|
|
get_next_token(const char *s)
|
|
{
|
|
unsigned int i;
|
|
i = get_token_len(s);
|
|
if (s[i] == '#')
|
|
return s+i+1;
|
|
return NULL;
|
|
}
|
|
|
|
int
|
|
cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
|
|
unsigned ressize)
|
|
{
|
|
struct cmdline_token_string *tk2;
|
|
struct cmdline_token_string_data *sd;
|
|
unsigned int token_len;
|
|
const char *str;
|
|
|
|
if (res && ressize < STR_TOKEN_SIZE)
|
|
return -1;
|
|
|
|
if (!tk || !buf || ! *buf)
|
|
return -1;
|
|
|
|
tk2 = (struct cmdline_token_string *)tk;
|
|
|
|
sd = &tk2->string_data;
|
|
|
|
/* fixed string */
|
|
if (sd->str) {
|
|
str = sd->str;
|
|
do {
|
|
token_len = get_token_len(str);
|
|
|
|
/* if token is too big... */
|
|
if (token_len >= STR_TOKEN_SIZE - 1) {
|
|
continue;
|
|
}
|
|
|
|
if ( strncmp(buf, str, token_len) ) {
|
|
continue;
|
|
}
|
|
|
|
if ( !cmdline_isendoftoken(*(buf+token_len)) ) {
|
|
continue;
|
|
}
|
|
|
|
break;
|
|
} while ( (str = get_next_token(str)) != NULL );
|
|
|
|
if (!str)
|
|
return -1;
|
|
}
|
|
/* unspecified string */
|
|
else {
|
|
token_len = 0;
|
|
while(!cmdline_isendoftoken(buf[token_len]) &&
|
|
token_len < (STR_TOKEN_SIZE-1))
|
|
token_len++;
|
|
|
|
/* return if token too long */
|
|
if (token_len >= STR_TOKEN_SIZE - 1) {
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
if (res) {
|
|
/* we are sure that token_len is < STR_TOKEN_SIZE-1 */
|
|
snprintf(res, STR_TOKEN_SIZE, "%s", buf);
|
|
*((char *)res + token_len) = 0;
|
|
}
|
|
|
|
|
|
return token_len;
|
|
}
|
|
|
|
int cmdline_complete_get_nb_string(cmdline_parse_token_hdr_t *tk)
|
|
{
|
|
struct cmdline_token_string *tk2;
|
|
struct cmdline_token_string_data *sd;
|
|
const char *str;
|
|
int ret = 1;
|
|
|
|
if (!tk)
|
|
return -1;
|
|
|
|
tk2 = (struct cmdline_token_string *)tk;
|
|
sd = &tk2->string_data;
|
|
|
|
if (!sd->str)
|
|
return 0;
|
|
|
|
str = sd->str;
|
|
while( (str = get_next_token(str)) != NULL ) {
|
|
ret++;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int cmdline_complete_get_elt_string(cmdline_parse_token_hdr_t *tk, int idx,
|
|
char *dstbuf, unsigned int size)
|
|
{
|
|
struct cmdline_token_string *tk2;
|
|
struct cmdline_token_string_data *sd;
|
|
const char *s;
|
|
unsigned int len;
|
|
|
|
if (!tk || !dstbuf || idx < 0)
|
|
return -1;
|
|
|
|
tk2 = (struct cmdline_token_string *)tk;
|
|
sd = &tk2->string_data;
|
|
|
|
s = sd->str;
|
|
|
|
while (idx-- && s)
|
|
s = get_next_token(s);
|
|
|
|
if (!s)
|
|
return -1;
|
|
|
|
len = get_token_len(s);
|
|
if (len > size - 1)
|
|
return -1;
|
|
|
|
memcpy(dstbuf, s, len);
|
|
dstbuf[len] = '\0';
|
|
return 0;
|
|
}
|
|
|
|
|
|
int cmdline_get_help_string(cmdline_parse_token_hdr_t *tk, char *dstbuf,
|
|
unsigned int size)
|
|
{
|
|
struct cmdline_token_string *tk2;
|
|
struct cmdline_token_string_data *sd;
|
|
const char *s;
|
|
|
|
if (!tk || !dstbuf)
|
|
return -1;
|
|
|
|
tk2 = (struct cmdline_token_string *)tk;
|
|
sd = &tk2->string_data;
|
|
|
|
s = sd->str;
|
|
|
|
if (s) {
|
|
if (get_next_token(s))
|
|
snprintf(dstbuf, size, MULTISTRING_HELP);
|
|
else
|
|
snprintf(dstbuf, size, FIXEDSTRING_HELP);
|
|
} else
|
|
snprintf(dstbuf, size, ANYSTRING_HELP);
|
|
|
|
return 0;
|
|
}
|