From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id B0F55A3 for ; Fri, 8 Mar 2019 18:48:07 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:48:04 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloAO002625; Fri, 8 Mar 2019 19:48:03 +0200 From: Yongseok Koh To: Maxime Coquelin Cc: Tiwei Bie , Jens Freimann , dpdk stable Date: Fri, 8 Mar 2019 09:46:46 -0800 Message-Id: <20190308174749.30771-8-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'vhost: fix crash after mmap failure' has been queued to LTS release 17.11.6 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: , X-List-Received-Date: Fri, 08 Mar 2019 17:48:08 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 855eea4e18c11d5a7856adfa570eca1f39863f6f Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Tue, 27 Nov 2018 10:54:51 +0100 Subject: [PATCH] vhost: fix crash after mmap failure [ upstream commit cf14478d775cadbaed4f5aa96e3812b44a2383c1 ] If mmap() call fails in vhost_user_set_mem_table, dev->mem is set to NULL. If later, qva_to_vva() is called, a segfault occurs. Fixes: 8f972312b8f4 ("vhost: support vhost-user") Reviewed-by: Tiwei Bie Signed-off-by: Maxime Coquelin Reviewed-by: Jens Freimann --- lib/librte_vhost/vhost_user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 74c286e34..aacf75b13 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -334,6 +334,9 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) struct rte_vhost_mem_region *r; uint32_t i; + if (unlikely(!dev || !dev->mem)) + goto out_error; + /* Find the region where the address lives. */ for (i = 0; i < dev->mem->nregions; i++) { r = &dev->mem->regions[i]; @@ -348,6 +351,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) r->host_user_addr; } } +out_error: *len = 0; return 0; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:40.801703391 -0800 +++ 0008-vhost-fix-crash-after-mmap-failure.patch 2019-03-08 09:46:39.987396000 -0800 @@ -1,14 +1,15 @@ -From cf14478d775cadbaed4f5aa96e3812b44a2383c1 Mon Sep 17 00:00:00 2001 +From 855eea4e18c11d5a7856adfa570eca1f39863f6f Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Tue, 27 Nov 2018 10:54:51 +0100 Subject: [PATCH] vhost: fix crash after mmap failure +[ upstream commit cf14478d775cadbaed4f5aa96e3812b44a2383c1 ] + If mmap() call fails in vhost_user_set_mem_table, dev->mem is set to NULL. If later, qva_to_vva() is called, a segfault occurs. Fixes: 8f972312b8f4 ("vhost: support vhost-user") -Cc: stable@dpdk.org Reviewed-by: Tiwei Bie Signed-off-by: Maxime Coquelin @@ -18,10 +19,10 @@ 1 file changed, 4 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index 3ea64eba6..557213491 100644 +index 74c286e34..aacf75b13 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c -@@ -489,6 +489,9 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) +@@ -334,6 +334,9 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) struct rte_vhost_mem_region *r; uint32_t i; @@ -31,7 +32,7 @@ /* Find the region where the address lives. */ for (i = 0; i < dev->mem->nregions; i++) { r = &dev->mem->regions[i]; -@@ -503,6 +506,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) +@@ -348,6 +351,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len) r->host_user_addr; } }