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 F035AA0350 for ; Mon, 28 Feb 2022 22:21:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4B9E40140; Mon, 28 Feb 2022 22:21:55 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id CB0B540140 for ; Mon, 28 Feb 2022 22:21:54 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id i8so356781wrr.8 for ; Mon, 28 Feb 2022 13:21:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PTIHI78vVsy9KDpcb26CL8C9aBqtQihb12mMO5Y/ytE=; b=nZft2jn6kcQ0U4YAHRpdpqhnTdgDW2a/q5jT/j7J7vQI7Bwam4cXRGT4Hy3ySJcozV /njWggnXGqs+qZ0RH8mY3tYDElfNhhBedJHbAg4Lpsv9sInZt36JREdQmoAnaGgjqK8i YJT258vYyjQlCQxI3uwGkBNiRFhcRp3t/tUj8KOfDc777Mo0G/FcqG4IFw46Py+G7I07 nU6G/6l8TrF54Qsj38g9UXGre7M2yQLrkd9TN03HURcKzxmTRnNiK3W/89fpwCnRwNux Vam0Q/eiSPXsRT2lYMnGVTpDAlNBU97xutmyMcpu+iZP5ULxnd0yFmaq9GrMPVV6EKik giZA== 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=PTIHI78vVsy9KDpcb26CL8C9aBqtQihb12mMO5Y/ytE=; b=hBiMnJYUDIFe+Jt54uzKu5JD1DS35CXZObAUwBzv7MeSOLmleYytwOEoTtuKvels/o wULI4UwnFqcxDxcxpdxkR4DQooYR8jUYZPaE3F0SR7QuNeqNQ77zDjKyfDqTHB1Kybud sd7DDEMAWW3D5VZzoq4zmdBniLGOlczd59VSgSd+95Wh+6mp+HIGeQpkMiuf3nNY/LDg lH5/+3ryisb9mTc6IHQ4ZGYcBM3vGkzKU4BmaQekWNZ3YG8W/Mz5F2/8laFUlOLr5Rl9 FiqY4YPUCSsUMqGgoPCv6iJ9X1RKNos3pGi1qnZRUylMTm0yEQemcEzPsAMCwlvM0TdM 2j2w== X-Gm-Message-State: AOAM5338uPGI7/0WI2MeOTdqo9oWdAOZmdQJfTQZLHUjbAZ8Ui0WrP5O kkRjzwWqGiuJGmG0Cp53kdhVa1Y/1Vtokg== X-Google-Smtp-Source: ABdhPJyVbrKcAWIB2lQ1RD2xvm9w5Z9jeyWhl54BxTWkuDoWHo1stJJ716S3Xy9r+2uw7FPrGZsWIw== X-Received: by 2002:adf:f905:0:b0:1e6:8ece:62f4 with SMTP id b5-20020adff905000000b001e68ece62f4mr17203914wrr.123.1646083314562; Mon, 28 Feb 2022 13:21:54 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id s16-20020adfecd0000000b001e7be443a17sm16650957wro.27.2022.02.28.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:54 -0800 (PST) From: luca.boccassi@gmail.com To: Martin Spinler Cc: dpdk stable Subject: patch 'net/nfb: fix array indexes in deinit functions' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:17 +0000 Message-Id: <20220228212047.3341966-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/aa27fa7968f1890e3f6679dd8310aa15ce0eb27a Thanks. Luca Boccassi --- >From aa27fa7968f1890e3f6679dd8310aa15ce0eb27a 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 c55bcdf1ef..d7c0879ef5 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:55.674850674 +0000 +++ 0021-net-nfb-fix-array-indexes-in-deinit-functions.patch 2022-02-28 21:17:53.864929757 +0000 @@ -1 +1 @@ -From 8a4c8edb1154a58bad807cdc2ca947773e2ee8f1 Mon Sep 17 00:00:00 2001 +From aa27fa7968f1890e3f6679dd8310aa15ce0eb27a 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 c55bcdf1ef..d7c0879ef5 100644