net/qede: fix crash when configure fails
Currently, if configuration fails (for example if a 100G card is used with an odd number of RX/TX queues) QEDE crashes due to a null pointer dereference. This commit fixes it by checking that the pointer is not NULL before using it. Fixes: 7105b24f4bb8 ("net/qede: fix memory alloc for multiple port reconfig") Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Acked-by: Rasesh Mody <rasesh.mody@cavium.com>
This commit is contained in:
parent
7d0bc2b159
commit
69d3e963e4
@ -235,12 +235,13 @@ static void qede_rx_queue_release_mbufs(struct qede_rx_queue *rxq)
|
||||
void qede_rx_queue_release(void *rx_queue)
|
||||
{
|
||||
struct qede_rx_queue *rxq = rx_queue;
|
||||
struct qede_dev *qdev = rxq->qdev;
|
||||
struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
|
||||
|
||||
PMD_INIT_FUNC_TRACE(edev);
|
||||
struct qede_dev *qdev;
|
||||
struct ecore_dev *edev;
|
||||
|
||||
if (rxq) {
|
||||
qdev = rxq->qdev;
|
||||
edev = QEDE_INIT_EDEV(qdev);
|
||||
PMD_INIT_FUNC_TRACE(edev);
|
||||
qede_rx_queue_release_mbufs(rxq);
|
||||
qdev->ops->common->chain_free(edev, &rxq->rx_bd_ring);
|
||||
qdev->ops->common->chain_free(edev, &rxq->rx_comp_ring);
|
||||
@ -399,12 +400,13 @@ static void qede_tx_queue_release_mbufs(struct qede_tx_queue *txq)
|
||||
void qede_tx_queue_release(void *tx_queue)
|
||||
{
|
||||
struct qede_tx_queue *txq = tx_queue;
|
||||
struct qede_dev *qdev = txq->qdev;
|
||||
struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
|
||||
|
||||
PMD_INIT_FUNC_TRACE(edev);
|
||||
struct qede_dev *qdev;
|
||||
struct ecore_dev *edev;
|
||||
|
||||
if (txq) {
|
||||
qdev = txq->qdev;
|
||||
edev = QEDE_INIT_EDEV(qdev);
|
||||
PMD_INIT_FUNC_TRACE(edev);
|
||||
qede_tx_queue_release_mbufs(txq);
|
||||
qdev->ops->common->chain_free(edev, &txq->tx_pbl);
|
||||
rte_free(txq->sw_tx_ring);
|
||||
|
Loading…
x
Reference in New Issue
Block a user