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 899E8A0524 for ; Thu, 4 Feb 2021 12:30:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 835FA240732; Thu, 4 Feb 2021 12:30:35 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 7B35324071E for ; Thu, 4 Feb 2021 12:30:33 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cqG-000545-P4; Thu, 04 Feb 2021 11:30:32 +0000 From: Christian Ehrhardt To: Gaetan Rivet Cc: Min Hu , dpdk stable Date: Thu, 4 Feb 2021 12:27:46 +0100 Message-Id: <20210204112954.2488123-11-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix port id validity check on parsing' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. 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/0fbbbfbb481429f6c0846ca4d0925746607d583b Thanks. Christian Ehrhardt --- >From 0fbbbfbb481429f6c0846ca4d0925746607d583b Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Fri, 17 Apr 2020 18:42:06 +0200 Subject: [PATCH] net/bonding: fix port id validity check on parsing [ upstream commit 44cd624a4b8c626fb5444199c06b5e05675c3cc1 ] If the port_id is equal to RTE_MAX_ETHPORTS, it should be considered invalid. Additionally, UNUSED ports are also not valid port ids to be used afterward. To simplify following the ethdev API rules, use the exposed function checking whether a port id is valid. Fixes: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Gaetan Rivet Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_args.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c index abdf552610..35616fb8bc 100644 --- a/drivers/net/bonding/rte_eth_bond_args.c +++ b/drivers/net/bonding/rte_eth_bond_args.c @@ -108,9 +108,8 @@ parse_port_id(const char *port_str) } } - if (port_id < 0 || port_id > RTE_MAX_ETHPORTS) { - RTE_BOND_LOG(ERR, "Slave port specified (%s) outside expected range", - port_str); + if (!rte_eth_dev_is_valid_port(port_id)) { + RTE_BOND_LOG(ERR, "Specified port (%s) is invalid", port_str); return -1; } return port_id; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:28.659795211 +0100 +++ 0011-net-bonding-fix-port-id-validity-check-on-parsing.patch 2021-02-04 12:04:27.814789520 +0100 @@ -1 +1 @@ -From 44cd624a4b8c626fb5444199c06b5e05675c3cc1 Mon Sep 17 00:00:00 2001 +From 0fbbbfbb481429f6c0846ca4d0925746607d583b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 44cd624a4b8c626fb5444199c06b5e05675c3cc1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org