* [dpdk-dev] [PATCH] net/qede: fix crash when configure fails
@ 2018-11-09 15:45 Timothy Redaelli
2018-11-10 0:39 ` Mody, Rasesh
0 siblings, 1 reply; 3+ messages in thread
From: Timothy Redaelli @ 2018-11-09 15:45 UTC (permalink / raw)
To: Rasesh Mody, Harish Patil, Shahed Shaikh; +Cc: dev, stable
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>
---
drivers/net/qede/qede_rxtx.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 8a4772f46..296189107 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -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);
--
2.19.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH] net/qede: fix crash when configure fails
2018-11-09 15:45 [dpdk-dev] [PATCH] net/qede: fix crash when configure fails Timothy Redaelli
@ 2018-11-10 0:39 ` Mody, Rasesh
2018-11-12 12:09 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Mody, Rasesh @ 2018-11-10 0:39 UTC (permalink / raw)
To: Timothy Redaelli, Patil, Harish, Shaikh, Shahed; +Cc: dev, stable
>From: Timothy Redaelli <tredaelli@redhat.com>
>Sent: Friday, November 09, 2018 7:46 AM
>
>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>
Fix looks good to me.
Acked-by: Rasesh Mody <rasesh.mody@cavium.com>
Thanks!
-Rasesh
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH] net/qede: fix crash when configure fails
2018-11-10 0:39 ` Mody, Rasesh
@ 2018-11-12 12:09 ` Ferruh Yigit
0 siblings, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2018-11-12 12:09 UTC (permalink / raw)
To: Mody, Rasesh, Timothy Redaelli, Patil, Harish, Shaikh, Shahed; +Cc: dev, stable
On 11/10/2018 12:39 AM, Mody, Rasesh wrote:
>> From: Timothy Redaelli <tredaelli@redhat.com>
>> Sent: Friday, November 09, 2018 7:46 AM
>>
>> 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>
>
> Fix looks good to me.
>
> Acked-by: Rasesh Mody <rasesh.mody@cavium.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-12 12:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-09 15:45 [dpdk-dev] [PATCH] net/qede: fix crash when configure fails Timothy Redaelli
2018-11-10 0:39 ` Mody, Rasesh
2018-11-12 12:09 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).