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 13100A0613 for ; Tue, 27 Aug 2019 11:31:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 086B854AE; Tue, 27 Aug 2019 11:31:22 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A22C31BFFB for ; Tue, 27 Aug 2019 11:31:20 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20BCB1018985; Tue, 27 Aug 2019 09:31:20 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 105E05C1B2; Tue, 27 Aug 2019 09:31:18 +0000 (UTC) From: Kevin Traynor To: Chenbo Xia Cc: Akhil Goyal , dpdk stable Date: Tue, 27 Aug 2019 10:30:03 +0100 Message-Id: <20190827093032.20423-26-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 27 Aug 2019 09:31:20 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/virtio: check PCI config read' 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/03/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/144158f9c35bed9c49427d1f8bb0b0bfbdf9be57 Thanks. Kevin Traynor --- >From 144158f9c35bed9c49427d1f8bb0b0bfbdf9be57 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Fri, 19 Apr 2019 00:58:34 +0000 Subject: [PATCH] crypto/virtio: check PCI config read [ upstream commit 691733e72bda85117adf0beb99e12794914fbb84 ] Fix unchecked return value issue for rte_pci_read_config. Coverity issue: 302861 Fixes: 25500d4b8076 ("crypto/virtio: support device init") Signed-off-by: Chenbo Xia Acked-by: Akhil Goyal --- drivers/crypto/virtio/virtio_pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c index 832c465bc..e24ccb607 100644 --- a/drivers/crypto/virtio/virtio_pci.c +++ b/drivers/crypto/virtio/virtio_pci.c @@ -398,7 +398,11 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_crypto_hw *hw) break; case VIRTIO_PCI_CAP_NOTIFY_CFG: - rte_pci_read_config(dev, &hw->notify_off_multiplier, + ret = rte_pci_read_config(dev, &hw->notify_off_multiplier, 4, pos + sizeof(cap)); - hw->notify_base = get_cfg_addr(dev, &cap); + if (ret != 4) + VIRTIO_CRYPTO_INIT_LOG_ERR( + "failed to read notify_off_multiplier: ret %d", ret); + else + hw->notify_base = get_cfg_addr(dev, &cap); break; case VIRTIO_PCI_CAP_DEVICE_CFG: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.330344884 +0100 +++ 0026-crypto-virtio-check-PCI-config-read.patch 2019-08-27 09:40:10.908144679 +0100 @@ -1 +1 @@ -From 691733e72bda85117adf0beb99e12794914fbb84 Mon Sep 17 00:00:00 2001 +From 144158f9c35bed9c49427d1f8bb0b0bfbdf9be57 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 691733e72bda85117adf0beb99e12794914fbb84 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0c0c64471..8137b3c5a 100644 +index 832c465bc..e24ccb607 100644