From: Kevin Traynor <ktraynor@redhat.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>
Cc: Tiwei Bie <tiwei.bie@intel.com>,
Jens Freimann <jfreimann@redhat.com>,
dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'vhost: fix crash after mmap failure' has been queued to stable release 18.08.1
Date: Fri, 14 Dec 2018 17:52:00 +0000 [thread overview]
Message-ID: <20181214175203.24908-16-ktraynor@redhat.com> (raw)
In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 18.08.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/18/18. 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. 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.
Kevin Traynor
---
>From 72c7adc36db4aaca11ee4787335ffc8115bcfc2e Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
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 <tiwei.bie@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
---
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 ba92d1650..68e9bf8c4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -447,4 +447,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
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++) {
@@ -461,4 +464,5 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
}
}
+out_error:
*len = 0;
--
2.19.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-12-14 17:49:48.167558800 +0000
+++ 0016-vhost-fix-crash-after-mmap-failure.patch 2018-12-14 17:49:47.000000000 +0000
@@ -1,14 +1,15 @@
-From cf14478d775cadbaed4f5aa96e3812b44a2383c1 Mon Sep 17 00:00:00 2001
+From 72c7adc36db4aaca11ee4787335ffc8115bcfc2e Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
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 <tiwei.bie@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
@@ -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 ba92d1650..68e9bf8c4 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
-@@ -490,4 +490,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
+@@ -447,4 +447,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
uint32_t i;
+ if (unlikely(!dev || !dev->mem))
@@ -29,7 +30,7 @@
+
/* Find the region where the address lives. */
for (i = 0; i < dev->mem->nregions; i++) {
-@@ -504,4 +507,5 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
+@@ -461,4 +464,5 @@ qva_to_vva(struct virtio_net *dev, uint64_t qva, uint64_t *len)
}
}
+out_error:
next prev parent reply other threads:[~2018-12-14 17:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 17:51 [dpdk-stable] patch 'net/ixgbe/base: add LHA ID' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/bnx2x: cleanup info logs' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'examples/bond: fix crash when there is no active slave' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix function documentation' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ifcvf: fix typo on struct name' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix getting RSS configuration' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ixgbe: fix Rx LRO capability offload for x550' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix overwriting RSS RETA' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/ixgbe: " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/i40e: fix port close' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/mlx5: fix validation of Rx queue number' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'ethdev: fix typo in queue setup error log' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'doc: fix a typo in testpmd guide' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'net/cxgbe: fix control queue mbuf pool naming convention' " Kevin Traynor
2018-12-14 17:51 ` [dpdk-stable] patch 'drivers/net: fix several Tx prepare functions' " Kevin Traynor
2018-12-14 17:52 ` Kevin Traynor [this message]
2018-12-14 17:52 ` [dpdk-stable] patch 'vhost: fix double read of descriptor flags' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: revert fix offload not supported mask' " Kevin Traynor
2018-12-14 17:52 ` [dpdk-stable] patch 'net/i40e: remove redundant reset of queue number' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181214175203.24908-16-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=jfreimann@redhat.com \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).