summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuba Kozak <kubax.kozak@intel.com>2017-07-27 09:28:22 +0200
committerYuanhan Liu <yliu@fridaylinux.org>2017-08-29 14:55:37 +0800
commitdb9d5625f3e93f031e468da6b797768fb9431edc (patch)
tree8ccef610e17865243c6dd34f1cbe1503f72de7b2
parent2c0718baf6cbe3067393957f31551e886a66dbcc (diff)
downloaddpdk-stable-db9d5625f3e93f031e468da6b797768fb9431edc.zip
dpdk-stable-db9d5625f3e93f031e468da6b797768fb9431edc.tar.gz
dpdk-stable-db9d5625f3e93f031e468da6b797768fb9431edc.tar.xz
net/i40e: fix parsing QinQ pattern
[ upstream commit c2be7f9b232fd6730dcec83555af050941c7805f ] Add check if o_vlan_mask and i_vlan_mask are not a NULL pointer. Coverity issue: 143448 Coverity issue: 143449 Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern") Signed-off-by: Kuba Kozak <kubax.kozak@intel.com> Acked-by: Jingjing Wu <jingjing.wu@intel.com>
-rw-r--r--drivers/net/i40e/i40e_flow.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 24e1c65..c1dac38 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -1821,8 +1821,10 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
}
/* Get filter specification */
- if ((o_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK)) &&
- (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) {
+ if ((o_vlan_mask != NULL) && (o_vlan_mask->tci ==
+ rte_cpu_to_be_16(I40E_TCI_MASK)) &&
+ (i_vlan_mask != NULL) &&
+ (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) {
filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci)
& I40E_TCI_MASK;
filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci)