From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0AC64A0542 for ; Fri, 11 Nov 2022 11:34:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06AAF40150; Fri, 11 Nov 2022 11:34:48 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7DBC54014F for ; Fri, 11 Nov 2022 11:34:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nAjqd2Fd3qEcFU0W2O054sG5AhF8B6ee2BJsJ/nBg1o=; b=eXGrpygjoVvrByiCKsjSCYnx+cGlXn6SRuEPJEs78m9fxCUl6ghxQbrbN9j1IWbxapDAfs WAYAnKvyPsi1XFsYzbhl2eq+VwFuKK2o0pvdi0ALcqsyc6WQ3KgfbGS2eK8dFZOT5Gwvti fOzwuwZx3AoOKyB+m4qH3w3is67+rA0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-153-_nHrjAPBOwG_h-sW-am8zQ-1; Fri, 11 Nov 2022 05:34:42 -0500 X-MC-Unique: _nHrjAPBOwG_h-sW-am8zQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32B3C8027EB; Fri, 11 Nov 2022 10:34:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271072022EA2; Fri, 11 Nov 2022 10:34:40 +0000 (UTC) From: Kevin Traynor To: Tomasz Jonak Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix null function pointer call' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:15 +0000 Message-Id: <20221111103337.307408-25-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/82c8b37f5a27b9750e2ede555640dbad879f63b7 Thanks. Kevin --- >From 82c8b37f5a27b9750e2ede555640dbad879f63b7 Mon Sep 17 00:00:00 2001 From: Tomasz Jonak Date: Wed, 12 Oct 2022 14:27:57 +0200 Subject: [PATCH] net/ice: fix null function pointer call [ upstream commit a8880adcd5f4ea92d0221ff41902d516e68e89ab ] In case rte_eth_dma_zone_reserve fails in ice_tx_queue_setup ice_tx_queue_release is called on 0 allocated but not initialized txq struct. This may happen on ENOMEM condition, size exhaustion of memconfig->memzones array as well as some others. Fixes: edec6dd83824 ("net/ice: remove redundant functions") Signed-off-by: Tomasz Jonak Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index e64fb00792..f7455c7726 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1198,5 +1198,6 @@ ice_rx_queue_release(void *rxq) } - q->rx_rel_mbufs(q); + if (q->rx_rel_mbufs != NULL) + q->rx_rel_mbufs(q); rte_free(q->sw_ring); rte_memzone_free(q->mz); @@ -1408,5 +1409,6 @@ ice_tx_queue_release(void *txq) } - q->tx_rel_mbufs(q); + if (q->tx_rel_mbufs != NULL) + q->tx_rel_mbufs(q); rte_free(q->sw_ring); rte_memzone_free(q->mz); -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.684891477 +0000 +++ 0025-net-ice-fix-null-function-pointer-call.patch 2022-11-11 10:32:17.079300789 +0000 @@ -1 +1 @@ -From a8880adcd5f4ea92d0221ff41902d516e68e89ab Mon Sep 17 00:00:00 2001 +From 82c8b37f5a27b9750e2ede555640dbad879f63b7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a8880adcd5f4ea92d0221ff41902d516e68e89ab ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 697251c603..953ff217df 100644 +index e64fb00792..f7455c7726 100644 @@ -25 +26 @@ -@@ -1303,5 +1303,6 @@ ice_rx_queue_release(void *rxq) +@@ -1198,5 +1198,6 @@ ice_rx_queue_release(void *rxq) @@ -33 +34 @@ -@@ -1513,5 +1514,6 @@ ice_tx_queue_release(void *txq) +@@ -1408,5 +1409,6 @@ ice_tx_queue_release(void *txq)