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

…/git/mst/vhost
git-mirror · Oct 21, 2010 · d836b31 · d836b31
2 parents 4993e0d + 6d97e55
commit d836b31
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
@@ -371,7 +371,7 @@ static int log_access_ok(void __user *log_base, u64 addr, unsigned long sz)
 	/* Make sure 64 bit math will not overflow. */
 	if (a > ULONG_MAX - (unsigned long)log_base ||
 	    a + (unsigned long)log_base > ULONG_MAX)
-		return -EFAULT;
+		return 0;
 
 	return access_ok(VERIFY_WRITE, log_base + a,
 			 (sz + VHOST_PAGE_SIZE * 8 - 1) / VHOST_PAGE_SIZE / 8);