From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E74B5427E0; Mon, 20 Mar 2023 10:28:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 472EC42D0D; Mon, 20 Mar 2023 10:28:09 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 6A433406BC for ; Mon, 20 Mar 2023 10:28:03 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pg8VL35HszKsJ1; Mon, 20 Mar 2023 17:25:46 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Mon, 20 Mar 2023 17:28:01 +0800 From: Chengwen Feng To: , , Ido Goshen , Ferruh Yigit , Juhamatti Kuusisaari , Cian Ferriter CC: Subject: [PATCH v2 04/44] net/pcap: fix segment fault when parse devargs Date: Mon, 20 Mar 2023 09:20:30 +0000 Message-ID: <20230320092110.37295-5-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230320092110.37295-1-fengchengwen@huawei.com> References: <20230314124813.39521-1-fengchengwen@huawei.com> <20230320092110.37295-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The rte_kvargs_process() was used to parse KV pairs, it also supports to parse 'only keys' (e.g. socket_id) type. And the callback function parameter 'value' is NULL when parsed 'only keys'. This patch fixes segment fault when parse input args with 'only keys'. Fixes: 4c173302c307 ("pcap: add new driver") Fixes: 53bf48403409 ("net/pcap: capture only ingress packets from Rx iface") Fixes: c9507cd0cada ("net/pcap: support physical interface MAC address") Fixes: a3f5252e5cbd ("net/pcap: enable infinitely Rx a pcap file") Cc: stable@dpdk.org Signed-off-by: Chengwen Feng --- drivers/net/pcap/pcap_ethdev.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c index bfec085045..9dc66e7ee9 100644 --- a/drivers/net/pcap/pcap_ethdev.c +++ b/drivers/net/pcap/pcap_ethdev.c @@ -1034,6 +1034,9 @@ open_rx_pcap(const char *key, const char *value, void *extra_args) struct pmd_devargs *rx = extra_args; pcap_t *pcap = NULL; + if (value == NULL) + return -EINVAL; + if (open_single_rx_pcap(pcap_filename, &pcap) < 0) return -1; @@ -1056,6 +1059,9 @@ open_tx_pcap(const char *key, const char *value, void *extra_args) struct pmd_devargs *dumpers = extra_args; pcap_dumper_t *dumper; + if (value == NULL) + return -EINVAL; + if (open_single_tx_pcap(pcap_filename, &dumper) < 0) return -1; @@ -1077,6 +1083,9 @@ open_rx_tx_iface(const char *key, const char *value, void *extra_args) struct pmd_devargs *tx = extra_args; pcap_t *pcap = NULL; + if (value == NULL) + return -EINVAL; + if (open_single_iface(iface, &pcap) < 0) return -1; @@ -1143,6 +1152,9 @@ open_rx_iface(const char *key, const char *value, void *extra_args) static inline int rx_iface_args_process(const char *key, const char *value, void *extra_args) { + if (value == NULL) + return -EINVAL; + if (strcmp(key, ETH_PCAP_RX_IFACE_ARG) == 0 || strcmp(key, ETH_PCAP_RX_IFACE_IN_ARG) == 0) return open_rx_iface(key, value, extra_args); @@ -1156,6 +1168,8 @@ rx_iface_args_process(const char *key, const char *value, void *extra_args) static int open_tx_iface(const char *key, const char *value, void *extra_args) { + if (value == NULL) + return -EINVAL; return open_iface(key, value, extra_args); } @@ -1163,7 +1177,7 @@ static int select_phy_mac(const char *key __rte_unused, const char *value, void *extra_args) { - if (extra_args) { + if (value != NULL && extra_args != NULL) { const int phy_mac = atoi(value); int *enable_phy_mac = extra_args; @@ -1177,7 +1191,7 @@ static int get_infinite_rx_arg(const char *key __rte_unused, const char *value, void *extra_args) { - if (extra_args) { + if (value != NULL && extra_args != NULL) { const int infinite_rx = atoi(value); int *enable_infinite_rx = extra_args; -- 2.17.1