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 79D8FA0A02 for ; Mon, 17 May 2021 18:13:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73C7D40041; Mon, 17 May 2021 18:13:32 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 2A182410E0 for ; Mon, 17 May 2021 18:13:31 +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 1lifs1-0007wd-8G; Mon, 17 May 2021 16:13:29 +0000 From: Christian Ehrhardt To: Chenbo Xia Cc: Maxime Coquelin , dpdk stable Date: Mon, 17 May 2021 18:08:21 +0200 Message-Id: <20210517161039.3132619-72-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 'examples/vhost: check memory table query' 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/5dfb1c2f83252a3b3eb144fedacb2b42cc83ff13 Thanks. Christian Ehrhardt --- >From 5dfb1c2f83252a3b3eb144fedacb2b42cc83ff13 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Fri, 19 Feb 2021 10:40:11 +0800 Subject: [PATCH] examples/vhost: check memory table query [ upstream commit 1739f814258cf7f4e25d55710918fa0ecc4d828e ] This patch fixes unchecked return value for rte_vhost_get_mem_table(), which is reported by coverity. Coverity issue: 364233 Fixes: ca059fa5e290 ("examples/vhost: demonstrate the new generic APIs") Signed-off-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- examples/vhost/virtio_net.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c index 8ea6b36d59..28e4b00960 100644 --- a/examples/vhost/virtio_net.c +++ b/examples/vhost/virtio_net.c @@ -23,6 +23,7 @@ vs_vhost_net_setup(struct vhost_dev *dev) uint16_t i; int vid = dev->vid; struct vhost_queue *queue; + int ret; RTE_LOG(INFO, VHOST_CONFIG, "setting builtin vhost-user net driver\n"); @@ -33,7 +34,12 @@ vs_vhost_net_setup(struct vhost_dev *dev) else dev->hdr_len = sizeof(struct virtio_net_hdr); - rte_vhost_get_mem_table(vid, &dev->mem); + ret = rte_vhost_get_mem_table(vid, &dev->mem); + if (ret < 0) { + RTE_LOG(ERR, VHOST_CONFIG, "Failed to get " + "VM memory layout for device(%d)\n", vid); + return; + } dev->nr_vrings = rte_vhost_get_vring_num(vid); for (i = 0; i < dev->nr_vrings; i++) { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.345285417 +0200 +++ 0072-examples-vhost-check-memory-table-query.patch 2021-05-17 17:40:29.239810012 +0200 @@ -1 +1 @@ -From 1739f814258cf7f4e25d55710918fa0ecc4d828e Mon Sep 17 00:00:00 2001 +From 5dfb1c2f83252a3b3eb144fedacb2b42cc83ff13 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1739f814258cf7f4e25d55710918fa0ecc4d828e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 64bf3d19ff..9064fc3a82 100644 +index 8ea6b36d59..28e4b00960 100644