X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fvhost%2Fvhost.c;h=e69d238c5af05254e16cad73b1456549cb8dbc35;hb=c2b41276da65481d36311a13d69020d150861c43;hp=7bd7a1e4409d4e6f384c513734b743a1b56a55ca;hpb=01e77706cdde7c0b47e5ca1f4284a795504c7c40;p=mv-sheeva.git

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 7bd7a1e4409..e69d238c5af 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -22,6 +22,7 @@
 #include <linux/poll.h>
 #include <linux/file.h>
 #include <linux/highmem.h>
+#include <linux/slab.h>
 
 #include <linux/net.h>
 #include <linux/if_packet.h>
@@ -235,6 +236,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;