patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v2] vhost: fix possible null pointer dereferencing
@ 2018-11-27  9:54 Maxime Coquelin
  2018-11-27 10:30 ` Jens Freimann
  0 siblings, 1 reply; 3+ messages in thread
From: Maxime Coquelin @ 2018-11-27  9:54 UTC (permalink / raw)
  To: dev, tiwei.bie, zhihong.wang, jfreimann; +Cc: stable, Maxime Coquelin

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>
---
 lib/librte_vhost/vhost_user.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 3ea64eba6..9fdd16172 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -489,6 +489,12 @@ 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)) {
+		*len = 0;
+
+		return 0;
+	}
+
 	/* Find the region where the address lives. */
 	for (i = 0; i < dev->mem->nregions; i++) {
 		r = &dev->mem->regions[i];
-- 
2.17.2

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v2] vhost: fix possible null pointer dereferencing
  2018-11-27  9:54 [dpdk-stable] [PATCH v2] vhost: fix possible null pointer dereferencing Maxime Coquelin
@ 2018-11-27 10:30 ` Jens Freimann
  2018-12-11 18:30   ` Maxime Coquelin
  0 siblings, 1 reply; 3+ messages in thread
From: Jens Freimann @ 2018-11-27 10:30 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: dev, tiwei.bie, zhihong.wang, stable

On Tue, Nov 27, 2018 at 10:54:51AM +0100, Maxime Coquelin wrote:
>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>
>---
> lib/librte_vhost/vhost_user.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>

Jumping to an out label would have worked as well, but it doesn't
really matter.

Reviewed-by: Jens Freimann <jfreimann@redhat.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH v2] vhost: fix possible null pointer dereferencing
  2018-11-27 10:30 ` Jens Freimann
@ 2018-12-11 18:30   ` Maxime Coquelin
  0 siblings, 0 replies; 3+ messages in thread
From: Maxime Coquelin @ 2018-12-11 18:30 UTC (permalink / raw)
  To: Jens Freimann; +Cc: dev, tiwei.bie, zhihong.wang, stable



On 11/27/18 11:30 AM, Jens Freimann wrote:
> On Tue, Nov 27, 2018 at 10:54:51AM +0100, Maxime Coquelin wrote:
>> 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>
>> ---
>> lib/librte_vhost/vhost_user.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
> 
> Jumping to an out label would have worked as well, but it doesn't
> really matter.
> 
> Reviewed-by: Jens Freimann <jfreimann@redhat.com>
> 


Thanks, applied with label change you suggested.

Maxime

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-12-11 18:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-27  9:54 [dpdk-stable] [PATCH v2] vhost: fix possible null pointer dereferencing Maxime Coquelin
2018-11-27 10:30 ` Jens Freimann
2018-12-11 18:30   ` Maxime Coquelin

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).