From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B8BAEA0679 for ; Tue, 30 Apr 2019 19:02:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC4AB58CB; Tue, 30 Apr 2019 19:02:07 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4562F58CB for ; Tue, 30 Apr 2019 19:02:05 +0200 (CEST) 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 mx1.redhat.com (Postfix) with ESMTPS id A705D30ADBD4; Tue, 30 Apr 2019 17:02:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id B03D16C52C; Tue, 30 Apr 2019 17:02:03 +0000 (UTC) From: Kevin Traynor To: Alejandro Lucero Cc: dpdk stable Date: Tue, 30 Apr 2019 18:01:07 +0100 Message-Id: <20190430170133.2331-12-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 30 Apr 2019 17:02:04 +0000 (UTC) Subject: [dpdk-stable] patch 'net/nfp: fix potential integer overflow' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/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 can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 0f39eac8640f9eb952e3e4f5986d39de7712ee64 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Mon, 8 Apr 2019 10:39:56 +0100 Subject: [PATCH] net/nfp: fix potential integer overflow [ upstream commit 3243f7c0d8e445fe7607a2dcac24bffffa830cae ] Coverity issue: 277204 Fixes: defb9a5dd156 ("nfp: introduce driver initialization") Signed-off-by: Alejandro Lucero --- drivers/net/nfp/nfp_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 49d4e2bd5..7d99f080a 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2793,7 +2793,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) case PCI_DEVICE_ID_NFP6000_VF_NIC: start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ); - tx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ; + tx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ; start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_RXQ); - rx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ; + rx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ; break; default: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.389413446 +0100 +++ 0012-net-nfp-fix-potential-integer-overflow.patch 2019-04-30 17:58:13.772140496 +0100 @@ -1 +1 @@ -From 3243f7c0d8e445fe7607a2dcac24bffffa830cae Mon Sep 17 00:00:00 2001 +From 0f39eac8640f9eb952e3e4f5986d39de7712ee64 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3243f7c0d8e445fe7607a2dcac24bffffa830cae ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 50058e056..d4c94d7cc 100644 +index 49d4e2bd5..7d99f080a 100644 @@ -19 +20 @@ -@@ -2856,7 +2856,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) +@@ -2793,7 +2793,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)