aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-07 16:52:29 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-07 16:52:29 -0700
commit04b1a22350e1e6464c3109886385178d119dbbb4 (patch)
treebea1d2d0f8692c82ccf9b9c727436fe9ddaa1531 /drivers
parenta55cb185b4a8f84cd05b66bb00b267ea455ecdc8 (diff)
parent179b284e2fc0c638035843968f7d7ab8ab701525 (diff)
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
-rw-r--r--drivers/vhost/vhost.c4
1 files changed, 4 insertions, 0 deletions
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;