diff options
author | Jeff Dike <jdike@addtoit.com> | 2010-04-07 09:59:10 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2010-04-07 17:04:45 +0300 |
commit | 179b284e2fc0c638035843968f7d7ab8ab701525 (patch) | |
tree | 6876a4fa365d13be8fb137856bf183e4085f77d7 /drivers | |
parent | 535297a6ae4c3b7a0562e71fac15c213eeec68e7 (diff) | |
download | linux-3.10-179b284e2fc0c638035843968f7d7ab8ab701525.tar.gz linux-3.10-179b284e2fc0c638035843968f7d7ab8ab701525.tar.bz2 linux-3.10-179b284e2fc0c638035843968f7d7ab8ab701525.zip |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/vhost/vhost.c | 4 |
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; |