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 8877CA034F for ; Tue, 1 Mar 2022 11:44:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B9BC426E5; Tue, 1 Mar 2022 11:44:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E5DB0426DC for ; Tue, 1 Mar 2022 11:44:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131450; 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=Y8r6TDA5Yykh0fHUAOFfoYTTopu+bPq5Op4iSbaMglg=; b=dWfVYOfwQk+25P9UNeeFcMFDPfI+7RW7AgmOf3sMjbZpmM8KfhCB8eUK/zg86DzI2N0oVg Uwad9ar7u1Za3vpL3l2iY+VH0EDNekF36nDPB/YiKDd1SBx0ZUNbnBqxgIY5hzgqV8fpz2 VAbfLll2qsWk2Tbf+jrI/Jui62vgKSE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-278-tDS9NsKYO52wFlNxeEbZMQ-1; Tue, 01 Mar 2022 05:44:07 -0500 X-MC-Unique: tDS9NsKYO52wFlNxeEbZMQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 092F751DC; Tue, 1 Mar 2022 10:44:07 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 312D8721DF; Tue, 1 Mar 2022 10:44:05 +0000 (UTC) From: Kevin Traynor To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix array indexes in deinit functions' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:52 +0000 Message-Id: <20220301104300.334382-36-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/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/afe8e58fed1606d67a88281a184e77ce1c538c01 Thanks. Kevin --- >From afe8e58fed1606d67a88281a184e77ce1c538c01 Mon Sep 17 00:00:00 2001 From: Martin Spinler Date: Tue, 15 Feb 2022 13:55:39 +0100 Subject: [PATCH] net/nfb: fix array indexes in deinit functions [ upstream commit 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 ] The indexes in the for cycle were wrongly used and the code accessed outside of the rxmac/txmac array. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Signed-off-by: Martin Spinler --- drivers/net/nfb/nfb_ethdev.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 3c39937816..0b27fe78cc 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -78,7 +78,8 @@ nfb_nc_rxmac_deinit(struct nc_rxmac *rxmac[RTE_MAX_NC_RXMAC], uint16_t max_rxmac) { - for (; max_rxmac > 0; --max_rxmac) { - nc_rxmac_close(rxmac[max_rxmac]); - rxmac[max_rxmac] = NULL; + uint16_t i; + for (i = 0; i < max_rxmac; i++) { + nc_rxmac_close(rxmac[i]); + rxmac[i] = NULL; } } @@ -96,7 +97,8 @@ nfb_nc_txmac_deinit(struct nc_txmac *txmac[RTE_MAX_NC_TXMAC], uint16_t max_txmac) { - for (; max_txmac > 0; --max_txmac) { - nc_txmac_close(txmac[max_txmac]); - txmac[max_txmac] = NULL; + uint16_t i; + for (i = 0; i < max_txmac; i++) { + nc_txmac_close(txmac[i]); + txmac[i] = NULL; } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.303000685 +0000 +++ 0036-net-nfb-fix-array-indexes-in-deinit-functions.patch 2022-03-01 10:41:01.289244095 +0000 @@ -1 +1 @@ -From 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 Mon Sep 17 00:00:00 2001 +From afe8e58fed1606d67a88281a184e77ce1c538c01 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org