From: "Wei Hu (Xavier)" <xavier_huwei@163.com>
To: dev@dpdk.org
Cc: xavier.huwei@huawei.com
Subject: [dpdk-dev] [PATCH v3 1/6] app/testpmd: fix missing verification of port id
Date: Sat, 19 Sep 2020 18:47:03 +0800 [thread overview]
Message-ID: <20200919104708.58451-2-xavier_huwei@163.com> (raw)
In-Reply-To: <20200919104708.58451-1-xavier_huwei@163.com>
From: Chengchang Tang <tangchengchang@huawei.com>
To set Tx vlan offloads, it is required to stop port firstly. But before
checking whether the port is stopped, the port id entered by the user
is not checked for validity. When the port id is illegal, it would lead
to a segmentation fault since it attempts to access a member of
non-existent port.
This patch adds verification of port id in tx vlan offloads and remove
duplicated check.
Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API")
Cc: stable@dpdk.org
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
v1 -> v2: remove the duplicated check.
---
app/test-pmd/cmdline.c | 9 +++++++++
app/test-pmd/config.c | 6 ------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 5f93409..43b7c2f 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4291,6 +4291,9 @@ cmd_tx_vlan_set_parsed(void *parsed_result,
{
struct cmd_tx_vlan_set_result *res = parsed_result;
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
if (!port_is_stopped(res->port_id)) {
printf("Please stop port %d first\n", res->port_id);
return;
@@ -4345,6 +4348,9 @@ cmd_tx_vlan_set_qinq_parsed(void *parsed_result,
{
struct cmd_tx_vlan_set_qinq_result *res = parsed_result;
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
if (!port_is_stopped(res->port_id)) {
printf("Please stop port %d first\n", res->port_id);
return;
@@ -4458,6 +4464,9 @@ cmd_tx_vlan_reset_parsed(void *parsed_result,
{
struct cmd_tx_vlan_reset_result *res = parsed_result;
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
if (!port_is_stopped(res->port_id)) {
printf("Please stop port %d first\n", res->port_id);
return;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index b6eb2a5..2bdec25 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3545,8 +3545,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
struct rte_eth_dev_info dev_info;
int ret;
- if (port_id_is_invalid(port_id, ENABLED_WARN))
- return;
if (vlan_id_is_invalid(vlan_id))
return;
@@ -3577,8 +3575,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
struct rte_eth_dev_info dev_info;
int ret;
- if (port_id_is_invalid(port_id, ENABLED_WARN))
- return;
if (vlan_id_is_invalid(vlan_id))
return;
if (vlan_id_is_invalid(vlan_id_outer))
@@ -3604,8 +3600,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
void
tx_vlan_reset(portid_t port_id)
{
- if (port_id_is_invalid(port_id, ENABLED_WARN))
- return;
ports[port_id].dev_conf.txmode.offloads &=
~(DEV_TX_OFFLOAD_VLAN_INSERT |
DEV_TX_OFFLOAD_QINQ_INSERT);
--
2.9.5
next prev parent reply other threads:[~2020-09-19 10:47 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 12:02 [dpdk-dev] [PATCH 0/4] minor fixes for testpmd Wei Hu (Xavier)
2020-08-18 12:02 ` [dpdk-dev] [PATCH 1/4] app/testpmd: fix missing verification of port id Wei Hu (Xavier)
2020-08-18 12:02 ` [dpdk-dev] [PATCH 2/4] app/testpmd: fix VLAN offload configuration when config fail Wei Hu (Xavier)
2020-08-18 12:02 ` [dpdk-dev] [PATCH 3/4] app/testpmd: fix packet header in txonly mode Wei Hu (Xavier)
2020-08-18 12:02 ` [dpdk-dev] [PATCH 4/4] app/testpmd: fix displaying Rx Tx queues information Wei Hu (Xavier)
2020-08-20 1:42 ` [dpdk-dev] [PATCH v2 0/4] minor fixes for testpmd Wei Hu (Xavier)
2020-08-20 1:42 ` [dpdk-dev] [PATCH v2 1/4] app/testpmd: fix missing verification of port id Wei Hu (Xavier)
2020-09-14 16:13 ` Ferruh Yigit
2020-08-20 1:42 ` [dpdk-dev] [PATCH v2 2/4] app/testpmd: fix VLAN offload configuration when config fail Wei Hu (Xavier)
2020-09-14 16:13 ` Ferruh Yigit
2020-08-20 1:42 ` [dpdk-dev] [PATCH v2 3/4] app/testpmd: fix packet header in txonly mode Wei Hu (Xavier)
2020-09-14 16:23 ` Ferruh Yigit
2020-09-17 7:10 ` Chengchang Tang
2020-09-17 11:16 ` Ferruh Yigit
2020-09-17 11:48 ` Chengchang Tang
2020-08-20 1:42 ` [dpdk-dev] [PATCH v2 4/4] app/testpmd: fix displaying Rx Tx queues information Wei Hu (Xavier)
2020-09-14 16:31 ` Ferruh Yigit
2020-09-16 9:23 ` Wei Hu (Xavier)
2020-09-16 15:58 ` Ferruh Yigit
2020-09-03 3:19 ` [dpdk-dev] [PATCH v2 0/4] minor fixes for testpmd Wei Hu (Xavier)
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 0/6] " Wei Hu (Xavier)
2020-09-19 10:47 ` Wei Hu (Xavier) [this message]
2020-09-22 14:49 ` [dpdk-dev] [PATCH v3 1/6] app/testpmd: fix missing verification of port id Ferruh Yigit
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 2/6] app/testpmd: fix VLAN offload configuration when config fail Wei Hu (Xavier)
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 3/6] app/testpmd: remove restriction on txpkts set Wei Hu (Xavier)
2020-09-22 14:51 ` Ferruh Yigit
2020-09-23 3:14 ` Wei Hu (Xavier)
2020-09-23 11:57 ` Wei Hu (Xavier)
2020-09-23 16:59 ` Ferruh Yigit
2020-09-24 6:08 ` Chengchang Tang
2020-09-24 12:19 ` Ferruh Yigit
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 4/6] app/testpmd: fix packet header in txonly mode Wei Hu (Xavier)
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 5/6] app/testpmd: fix valid desc id check Wei Hu (Xavier)
2020-09-22 14:53 ` Ferruh Yigit
2020-09-19 10:47 ` [dpdk-dev] [PATCH v3 6/6] app/testpmd: fix displaying Rx Tx queues information Wei Hu (Xavier)
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 0/6] minor fixes for testpmd Wei Hu (Xavier)
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 1/6] app/testpmd: fix missing verification of port id Wei Hu (Xavier)
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 2/6] app/testpmd: fix VLAN offload configuration when config fail Wei Hu (Xavier)
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 3/6] app/testpmd: remove restriction on txpkts set Wei Hu (Xavier)
2020-11-23 11:50 ` Slava Ovsiienko
2020-11-24 10:27 ` Thomas Monjalon
2020-11-24 12:23 ` Ferruh Yigit
2020-11-24 13:01 ` Kevin Traynor
2020-11-25 14:06 ` Ferruh Yigit
2020-11-26 7:24 ` Slava Ovsiienko
2020-11-26 12:38 ` Ferruh Yigit
2020-11-27 13:05 ` Slava Ovsiienko
2020-12-02 12:07 ` Ferruh Yigit
2020-12-03 9:45 ` Slava Ovsiienko
2020-12-03 10:18 ` Ferruh Yigit
2020-12-11 15:07 ` [dpdk-dev] [PATCH] app/testpmd: fix segment number check Viacheslav Ovsiienko
2020-12-11 16:00 ` Andrew Boyer
2020-12-11 16:14 ` Slava Ovsiienko
2020-12-16 12:12 ` Ferruh Yigit
2020-12-16 12:33 ` Slava Ovsiienko
2020-12-16 12:36 ` Ferruh Yigit
2021-04-23 16:09 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
2021-04-26 11:23 ` Li, Xiaoyun
2021-04-27 11:42 ` Ferruh Yigit
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 4/6] app/testpmd: fix packet header in txonly mode Wei Hu (Xavier)
2020-09-29 15:40 ` Ferruh Yigit
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 5/6] app/testpmd: fix valid desc id check Wei Hu (Xavier)
2020-09-25 12:47 ` [dpdk-dev] [PATCH v4 6/6] app/testpmd: fix displaying Rx Tx queues information Wei Hu (Xavier)
2020-09-29 15:40 ` [dpdk-dev] [PATCH v4 0/6] minor fixes for testpmd Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200919104708.58451-2-xavier_huwei@163.com \
--to=xavier_huwei@163.com \
--cc=dev@dpdk.org \
--cc=xavier.huwei@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).