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 598B6A0A02 for ; Mon, 17 May 2021 18:13:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E40340041; Mon, 17 May 2021 18:13:30 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 36CC340041 for ; Mon, 17 May 2021 18:13:29 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifs0-0007wd-WE; Mon, 17 May 2021 16:13:29 +0000 From: Christian Ehrhardt To: Xiao Wang Cc: Chenbo Xia , dpdk stable Date: Mon, 17 May 2021 18:08:20 +0200 Message-Id: <20210517161039.3132619-71-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vdpa/ifc: check PCI config read' has been queued to stable release 19.11.9 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.9 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/19/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/8e6f032a5812e031705d5c4050d0459e383b40a9 Thanks. Christian Ehrhardt --- >From 8e6f032a5812e031705d5c4050d0459e383b40a9 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Tue, 9 Mar 2021 16:43:15 +0800 Subject: [PATCH] vdpa/ifc: check PCI config read [ upstream commit 629d75653bc584a2927a87566bf00beea661f91b ] The return value of rte_pci_read_config should be checked. Coverity issue: 302860 Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") Signed-off-by: Xiao Wang Reviewed-by: Chenbo Xia --- drivers/net/ifc/base/ifcvf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c index 3c0b2dff66..721cb1da8a 100644 --- a/drivers/net/ifc/base/ifcvf.c +++ b/drivers/net/ifc/base/ifcvf.c @@ -65,8 +65,13 @@ ifcvf_init_hw(struct ifcvf_hw *hw, PCI_DEV *dev) hw->common_cfg = get_cap_addr(hw, &cap); break; case IFCVF_PCI_CAP_NOTIFY_CFG: - PCI_READ_CONFIG_DWORD(dev, &hw->notify_off_multiplier, + ret = PCI_READ_CONFIG_DWORD(dev, + &hw->notify_off_multiplier, pos + sizeof(cap)); + if (ret < 0) { + DEBUGOUT("failed to read notify_off_multiplier\n"); + return -1; + } hw->notify_base = get_cap_addr(hw, &cap); hw->notify_region = cap.bar; break; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.311580031 +0200 +++ 0071-vdpa-ifc-check-PCI-config-read.patch 2021-05-17 17:40:29.239810012 +0200 @@ -1 +1 @@ -From 629d75653bc584a2927a87566bf00beea661f91b Mon Sep 17 00:00:00 2001 +From 8e6f032a5812e031705d5c4050d0459e383b40a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 629d75653bc584a2927a87566bf00beea661f91b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - drivers/vdpa/ifc/base/ifcvf.c | 7 ++++++- + drivers/net/ifc/base/ifcvf.c | 7 ++++++- @@ -18 +19 @@ -diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c +diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifc/base/ifcvf.c @@ -20,2 +21,2 @@ ---- a/drivers/vdpa/ifc/base/ifcvf.c -+++ b/drivers/vdpa/ifc/base/ifcvf.c +--- a/drivers/net/ifc/base/ifcvf.c ++++ b/drivers/net/ifc/base/ifcvf.c