[dpdk-stable] [PATCH 17.11 1/6] net/failsafe: fix crash on slave queue release

[Yongseok Koh]

> On Dec 10, 2018, at 7:10 AM, Andrew Rybchenko <arybchenko at solarflare.com> wrote:
> 
> From: Igor Romanov <igor.romanov at oktetlabs.ru>
> 
> [ backported from upstream commit 6b35f4d88b40645425b4b8e156423982471eccf5 ]
> 
> Releasing a queue that is already released by slave may cause a
> segmentation fault. For example, after a successfull device
> configuration a queue is set up. Afterwards the device is reconfigured
> with an invalid argument, forcing slaves to release the queues
> (e.g. rte_eth_dev.data.tx_queues). Finally the failsafe's queues
> are released. The queue release functions also try to release slaves'
> queues using ETH(sdev)->data->tx_queues which is NULL at the time.
> 
> Add checks for NULL slaves' Tx and Rx queues before releasing them.
> 
> Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")
> 
> Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
> ---

Series applied to stable/17.11

Thanks,
Yongseok

> drivers/net/failsafe/failsafe_ops.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
> index 9a5d873..885d63c 100644
> --- a/drivers/net/failsafe/failsafe_ops.c
> +++ b/drivers/net/failsafe/failsafe_ops.c
> @@ -260,9 +260,13 @@
> 		return;
> 	rxq = queue;
> 	dev = rxq->priv->dev;
> -	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
> -		SUBOPS(sdev, rx_queue_release)
> -			(ETH(sdev)->data->rx_queues[rxq->qid]);
> +	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
> +		if (ETH(sdev)->data->rx_queues != NULL &&
> +		    ETH(sdev)->data->rx_queues[rxq->qid] != NULL) {
> +			SUBOPS(sdev, rx_queue_release)
> +				(ETH(sdev)->data->rx_queues[rxq->qid]);
> +		}
> +	}
> 	dev->data->rx_queues[rxq->qid] = NULL;
> 	rte_free(rxq);
> }
> @@ -328,9 +332,13 @@
> 		return;
> 	txq = queue;
> 	dev = txq->priv->dev;
> -	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
> -		SUBOPS(sdev, tx_queue_release)
> -			(ETH(sdev)->data->tx_queues[txq->qid]);
> +	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
> +		if (ETH(sdev)->data->tx_queues != NULL &&
> +		    ETH(sdev)->data->tx_queues[txq->qid] != NULL) {
> +			SUBOPS(sdev, tx_queue_release)
> +				(ETH(sdev)->data->tx_queues[txq->qid]);
> +		}
> +	}
> 	dev->data->tx_queues[txq->qid] = NULL;
> 	rte_free(txq);
> }
> -- 
> 1.8.3.1
>