From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 7 Apr 2010 13:59:10 +0000 (-0400)
Subject: vhost-net: fix vq_memory_access_ok error checking
X-Git-Tag: v2.6.34-rc5~25^2~17^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=179b284e2fc0c638035843968f7d7ab8ab701525;p=~andy%2Flinux

vhost-net: fix vq_memory_access_ok error checking

vq_memory_access_ok needs to check whether mem == NULL

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 7bd7a1e4409..b8e11272081 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -235,6 +235,10 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem,
 			       int log_all)
 {
 	int i;
+
+        if (!mem)
+                return 0;
+
 	for (i = 0; i < mem->nregions; ++i) {
 		struct vhost_memory_region *m = mem->regions + i;
 		unsigned long a = m->userspace_addr;