From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0FE89A2E1B for ; Thu, 5 Sep 2019 12:18:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CCC241EF68; Thu, 5 Sep 2019 12:18:07 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D02651EF68 for ; Thu, 5 Sep 2019 12:18:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1123981F13; Thu, 5 Sep 2019 10:18:05 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A35719C6A; Thu, 5 Sep 2019 10:18:03 +0000 (UTC) From: Kevin Traynor To: Andrew Rybchenko Cc: Thomas Monjalon , dpdk stable Date: Thu, 5 Sep 2019 11:17:01 +0100 Message-Id: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 05 Sep 2019 10:18:05 +0000 (UTC) Subject: [dpdk-stable] patch 'ethdev: avoid getting uninitialized info for bad port' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.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 09/12/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4551d9c814af6efde293ec280a5ffdbd8442be7d Thanks. Kevin Traynor --- >From 4551d9c814af6efde293ec280a5ffdbd8442be7d Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 23 Jul 2019 13:11:21 +0100 Subject: [PATCH] ethdev: avoid getting uninitialized info for bad port [ upstream commit b6719879855da581c4b6dc29680b54c10e109439 ] rte_eth_dev_info_get() returns void and caller does know if the function does its job or not. Changing of the return value to int would be API/ABI breakage which requires deprecation process and cannot be backported to stable branches. For now, make sure that device info is initialized even in the case of invalid port ID. Fixes: a30268e9a2d0 ("ethdev: reset whole dev info structure before filling") Signed-off-by: Andrew Rybchenko Acked-by: Thomas Monjalon --- lib/librte_ethdev/rte_ethdev.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 191658da1..3c75d3c78 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -2518,8 +2518,13 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) }; - RTE_ETH_VALID_PORTID_OR_RET(port_id); - dev = &rte_eth_devices[port_id]; - + /* + * Init dev_info before port_id check since caller does not have + * return status and does not know if get is successful or not. + */ memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); + + RTE_ETH_VALID_PORTID_OR_RET(port_id); + dev = &rte_eth_devices[port_id]; + dev_info->rx_desc_lim = lim; dev_info->tx_desc_lim = lim; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:47.609775697 +0100 +++ 0001-ethdev-avoid-getting-uninitialized-info-for-bad-port.patch 2019-09-05 10:36:47.436702294 +0100 @@ -1 +1 @@ -From b6719879855da581c4b6dc29680b54c10e109439 Mon Sep 17 00:00:00 2001 +From 4551d9c814af6efde293ec280a5ffdbd8442be7d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6719879855da581c4b6dc29680b54c10e109439 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 64191737c..17d183e1f 100644 +index 191658da1..3c75d3c78 100644 @@ -25 +26 @@ -@@ -2553,8 +2553,13 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) +@@ -2518,8 +2518,13 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)