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 DDFEBA0093 for ; Wed, 9 Mar 2022 12:02:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D93D7410F3; Wed, 9 Mar 2022 12:02:12 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 9F04540150 for ; Wed, 9 Mar 2022 12:02:11 +0100 (CET) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 60E063F1AF for ; Wed, 9 Mar 2022 11:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823731; bh=L5GMrnvSvZCzzl1578IGOzWwlMdkTyfZNb+02WrsNzE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GJhwIW7WrcCd2QZkH8oTWbPpCLFprjDUYt1zHNhRHtiIcbjuDKy1KxCnFGowepkRF GdMWYxnU+Am2L/vhWNdc56wStTgrDCtatBSir7IpA8b0qnAX58XZXeJc4mqVy7FEtm t9msvqIkokIQHxqnNX27GrFM7TeILfAjB1aykVYNXAM3IJV4sI3y3J1neV4EKU4yEj DnSkomTtOGCHXhAwgKV9TBXczXCCKcGIcxOjzXHTlpxJQyzZfKWlnAsWLcrI1s0nJp 751I4p3/+CZFDeIQO0saP9Q76ZIicsSGF0/CnpFvH4Qo8XVS6WX4ymWJ/dC48PnEtI TibHxsmugVLpQ== Received: by mail-wr1-f71.google.com with SMTP id y13-20020adfee0d000000b001f1fa450a3dso638572wrn.11 for ; Wed, 09 Mar 2022 03:02:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L5GMrnvSvZCzzl1578IGOzWwlMdkTyfZNb+02WrsNzE=; b=m5y3W8+Mz4FsrBeFeYtWkC2Ae0RlEU6CsNzRwfdV/HrE7BbrBkz3qB6lcLZe9DxXEE hpm2WE3qNO86UiHZ4XuKF7fhK89FFMdLabtpA92z1dDnR3t2tw7DHU8qKxr4CWRbeTlW bFiSq74d9RZsBtZtpLmftjhcT2u5JyM7H6VbQQDDM//89AY8ol+PPV8P7JTiRzTPGIRj HL/Qs2qOr6gNI3bonZOIHMcJGD5GLZyaWXlDW//i+7awqDxPymi1kEvpPvngo7LBk8f6 9bqM56/9u40bPvBYpjzvSgJM5kd0/IHEP+VxFhxa7r04tygUo/rko8NH4c7zNTQmj5OF eOAg== X-Gm-Message-State: AOAM532Ogs7AwqxYMYMJL6f9yo9GTOS70hPFvjc9EFkk4LDYndQUb3bH olxorRrMAQMkaqaK/FlAZLvWJr097PX+pWJQG/A03l2YAK/tuKeKFlzXrZOhGDZAoNoonKIrEsJ CKY5emqAmhomMnckTaaZq8/FI X-Received: by 2002:adf:e342:0:b0:1f0:648f:c32b with SMTP id n2-20020adfe342000000b001f0648fc32bmr15712088wrj.204.1646823729794; Wed, 09 Mar 2022 03:02:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIk8ty/TrtR0nY+DlgSSELD3vQ1gJqLtCNVksPBOV4SMsUvND2nib/DQVw+ank28CU1KlOTQ== X-Received: by 2002:adf:e342:0:b0:1f0:648f:c32b with SMTP id n2-20020adfe342000000b001f0648fc32bmr15712068wrj.204.1646823729477; Wed, 09 Mar 2022 03:02:09 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id l12-20020a05600012cc00b001f059bcbd7asm1332253wrx.31.2022.03.09.03.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:02:09 -0800 (PST) From: christian.ehrhardt@canonical.com To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix array indexes in deinit functions' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:43 +0100 Message-Id: <20220309110116.1295395-12-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.12 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/11/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/2294078fe8a8024a3728e826d9e605967184a318 Thanks. Christian Ehrhardt --- >From 2294078fe8a8024a3728e826d9e605967184a318 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 341b57edb4..697d4af1c3 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -77,9 +77,10 @@ static void 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; } } @@ -95,9 +96,10 @@ static void 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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:44.003615230 +0100 +++ 0012-net-nfb-fix-array-indexes-in-deinit-functions.patch 2022-03-09 11:57:43.336938030 +0100 @@ -1 +1 @@ -From 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 Mon Sep 17 00:00:00 2001 +From 2294078fe8a8024a3728e826d9e605967184a318 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 3c39937816..0b27fe78cc 100644 +index 341b57edb4..697d4af1c3 100644