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>
251 lines
6.2 KiB
C
251 lines
6.2 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.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <inttypes.h>
|
|
|
|
#include <cmdline_parse.h>
|
|
#include <cmdline_parse_portlist.h>
|
|
|
|
#include "test_cmdline.h"
|
|
|
|
struct portlist_str {
|
|
const char * str;
|
|
uint32_t portmap;
|
|
};
|
|
|
|
/* valid strings */
|
|
const struct portlist_str portlist_valid_strs[] = {
|
|
{"0", 0x1U },
|
|
{"0-10", 0x7FFU},
|
|
{"10-20", 0x1FFC00U},
|
|
{"all", UINT32_MAX},
|
|
{"0,1,2,3", 0xFU},
|
|
{"0,1-5", 0x3FU},
|
|
{"0,0,0", 0x1U},
|
|
{"31,0-10,15", 0x800087FFU},
|
|
{"0000", 0x1U},
|
|
{"00,01,02,03", 0xFU},
|
|
{"000,001,002,003", 0xFU},
|
|
};
|
|
|
|
/* valid strings but with garbage at the end.
|
|
* these strings should still be valid because parser checks
|
|
* for end of token, which is either a space/tab, a newline/return,
|
|
* or a hash sign.
|
|
*/
|
|
|
|
const char * portlist_garbage_strs[] = {
|
|
"0-31 garbage",
|
|
"0-31#garbage",
|
|
"0-31\0garbage",
|
|
"0-31\ngarbage",
|
|
"0-31\rgarbage",
|
|
"0-31\tgarbage",
|
|
"0,1,2,3-31 garbage",
|
|
"0,1,2,3-31#garbage",
|
|
"0,1,2,3-31\0garbage",
|
|
"0,1,2,3-31\ngarbage",
|
|
"0,1,2,3-31\rgarbage",
|
|
"0,1,2,3-31\tgarbage",
|
|
"all garbage",
|
|
"all#garbage",
|
|
"all\0garbage",
|
|
"all\ngarbage",
|
|
"all\rgarbage",
|
|
"all\tgarbage",
|
|
};
|
|
|
|
/* invalid strings */
|
|
const char * portlist_invalid_strs[] = {
|
|
/* valid syntax, invalid chars */
|
|
"A-B",
|
|
"0-S",
|
|
"1,2,3,4,Q",
|
|
"A-4,3-15",
|
|
"0-31invalid",
|
|
/* valid chars, invalid syntax */
|
|
"1, 2",
|
|
"1- 4",
|
|
",2",
|
|
",2 ",
|
|
"-1, 4",
|
|
"5-1",
|
|
"2-",
|
|
/* misc */
|
|
"-"
|
|
"a",
|
|
"A",
|
|
",",
|
|
"#",
|
|
" ",
|
|
"\0",
|
|
"",
|
|
/* too long */
|
|
"0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,"
|
|
"0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2",
|
|
};
|
|
|
|
#define PORTLIST_VALID_STRS_SIZE \
|
|
(sizeof(portlist_valid_strs) / sizeof(portlist_valid_strs[0]))
|
|
#define PORTLIST_GARBAGE_STRS_SIZE \
|
|
(sizeof(portlist_garbage_strs) / sizeof(portlist_garbage_strs[0]))
|
|
#define PORTLIST_INVALID_STRS_SIZE \
|
|
(sizeof(portlist_invalid_strs) / sizeof(portlist_invalid_strs[0]))
|
|
|
|
|
|
|
|
|
|
/* test invalid parameters */
|
|
int
|
|
test_parse_portlist_invalid_param(void)
|
|
{
|
|
cmdline_portlist_t result;
|
|
char buf[CMDLINE_TEST_BUFSIZE];
|
|
int ret;
|
|
|
|
memset(&buf, 0, sizeof(buf));
|
|
memset(&result, 0, sizeof(cmdline_portlist_t));
|
|
|
|
/* try all null */
|
|
ret = cmdline_parse_portlist(NULL, NULL, NULL, 0);
|
|
if (ret != -1) {
|
|
printf("Error: parser accepted null parameters!\n");
|
|
return -1;
|
|
}
|
|
|
|
/* try null buf */
|
|
ret = cmdline_parse_portlist(NULL, NULL, (void*)&result,
|
|
sizeof(result));
|
|
if (ret != -1) {
|
|
printf("Error: parser accepted null string!\n");
|
|
return -1;
|
|
}
|
|
|
|
/* try null result */
|
|
ret = cmdline_parse_portlist(NULL, portlist_valid_strs[0].str, NULL, 0);
|
|
if (ret == -1) {
|
|
printf("Error: parser rejected null result!\n");
|
|
return -1;
|
|
}
|
|
|
|
/* token is not used in ether_parse anyway so there's no point in
|
|
* testing it */
|
|
|
|
/* test help function */
|
|
|
|
/* coverage! */
|
|
ret = cmdline_get_help_portlist(NULL, buf, sizeof(buf));
|
|
if (ret < 0) {
|
|
printf("Error: help function failed with valid parameters!\n");
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* test valid parameters but invalid data */
|
|
int
|
|
test_parse_portlist_invalid_data(void)
|
|
{
|
|
int ret = 0;
|
|
unsigned i;
|
|
cmdline_portlist_t result;
|
|
|
|
/* test invalid strings */
|
|
for (i = 0; i < PORTLIST_INVALID_STRS_SIZE; i++) {
|
|
|
|
memset(&result, 0, sizeof(cmdline_portlist_t));
|
|
|
|
ret = cmdline_parse_portlist(NULL, portlist_invalid_strs[i],
|
|
(void*)&result, sizeof(result));
|
|
if (ret != -1) {
|
|
printf("Error: parsing %s succeeded!\n",
|
|
portlist_invalid_strs[i]);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* test valid parameters and data */
|
|
int
|
|
test_parse_portlist_valid(void)
|
|
{
|
|
int ret = 0;
|
|
unsigned i;
|
|
cmdline_portlist_t result;
|
|
|
|
/* test full strings */
|
|
for (i = 0; i < PORTLIST_VALID_STRS_SIZE; i++) {
|
|
|
|
memset(&result, 0, sizeof(cmdline_portlist_t));
|
|
|
|
ret = cmdline_parse_portlist(NULL, portlist_valid_strs[i].str,
|
|
(void*)&result, sizeof(result));
|
|
if (ret < 0) {
|
|
printf("Error: parsing %s failed!\n",
|
|
portlist_valid_strs[i].str);
|
|
return -1;
|
|
}
|
|
if (result.map != portlist_valid_strs[i].portmap) {
|
|
printf("Error: parsing %s failed: map mismatch!\n",
|
|
portlist_valid_strs[i].str);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/* test garbage strings */
|
|
for (i = 0; i < PORTLIST_GARBAGE_STRS_SIZE; i++) {
|
|
|
|
memset(&result, 0, sizeof(cmdline_portlist_t));
|
|
|
|
ret = cmdline_parse_portlist(NULL, portlist_garbage_strs[i],
|
|
(void*)&result, sizeof(result));
|
|
if (ret < 0) {
|
|
printf("Error: parsing %s failed!\n",
|
|
portlist_garbage_strs[i]);
|
|
return -1;
|
|
}
|
|
if (result.map != UINT32_MAX) {
|
|
printf("Error: parsing %s failed: map mismatch!\n",
|
|
portlist_garbage_strs[i]);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|