Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/mst/vhost
git-mirror · Apr 7, 2010 · 04b1a22 · 04b1a22
2 parents a55cb18 + 179b284
commit 04b1a22
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;