d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: fix a Tx queue double release possibility

Browse Source 
There are two function that call sfc_tx_qfini():
sfc_tx_fini_queues() and sfc_tx_queue_release(). But only
sfc_tx_queue_release() sets tx_queues pointer of the device data to NULL.
It may lead to the scenario in which a queue is destroyed by
sfc_tx_fini_queues() and after the queue is attempted to be destroyed again
by sfc_tx_queue_release().

Move NULL assignment to sfc_tx_qfini().

Fixes: b1b7ad933b ("net/sfc: set up and release Tx queues")
Cc: stable@dpdk.org

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Igor Romanov 2018-09-14 08:31:36 +01:00 committed by Ferruh Yigit
parent 7eb7588c99
commit 5d138ef92d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/sfc/sfc_ethdev.c
View File

@ -498,9 +498,6 @@ sfc_tx_queue_release(void *queue)
sfc_adapter_lock(sa);
SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues);
sa->eth_dev->data->tx_queues[sw_index] = NULL;
sfc_tx_qfini(sa, sw_index);
sfc_adapter_unlock(sa);

2
drivers/net/sfc/sfc_tx.c
View File

@ -233,6 +233,8 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
sfc_log_init(sa, "TxQ = %u", sw_index);
SFC_ASSERT(sw_index < sa->txq_count);
sa->eth_dev->data->tx_queues[sw_index] = NULL;
txq_info = &sa->txq_info[sw_index];
txq = txq_info->txq;