> -----Original Message----- > From: Dai, Wei > Sent: Monday, April 16, 2018 4:14 PM > To: Lu, Wenzhuo <[email protected]>; Ananyev, Konstantin > <[email protected]>; Zhang, Qi Z <[email protected]>; Lin, > Xueqin <[email protected]> > Cc: [email protected]; Dai, Wei <[email protected]>; [email protected] > Subject: [PATCH] net/ixgbe: fix segfault in configuring VF VLAN strip > > This patch fixes a segment fault in ixgbevf_vlan_offload_set( ) when a Rx > queue with index < max_rx_queues is not setup. > For such queue, rxq = dev->data->rx_queues[i] is null pointer. > > Fixes: 860a94d3c692 ("net/ixgbe: support VLAN strip per queue offloading in > VF") > Cc: [email protected] > > Signed-off-by: Wei Dai <[email protected]>
Acked-by: Qi Zhang <[email protected]> (Wrong "Fixes" reference, will be correct during apply) > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > b/drivers/net/ixgbe/ixgbe_ethdev.c > index a5e2fc0..33ee52e 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -5184,15 +5184,13 @@ ixgbevf_vlan_strip_queue_set(struct > rte_eth_dev *dev, uint16_t queue, int on) static int > ixgbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask) { > - struct ixgbe_hw *hw = > - IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); > struct ixgbe_rx_queue *rxq; > uint16_t i; > int on = 0; > > /* VF function only support hw strip feature, others are not support */ > if (mask & ETH_VLAN_STRIP_MASK) { > - for (i = 0; i < hw->mac.max_rx_queues; i++) { > + for (i = 0; i < dev->data->nb_rx_queues; i++) { > rxq = dev->data->rx_queues[i]; > on = !!(rxq->offloads & DEV_RX_OFFLOAD_VLAN_STRIP); > ixgbevf_vlan_strip_queue_set(dev, i, on); > -- > 2.7.5
