---

yaml --- r: 184593 b: refs/heads/master c: d6db3f5 h: refs/heads/master i: 184591: 5b97cb1 v: v3
git-mirror · Feb 28, 2010 · 69b01a9 · 69b01a9
1 parent f6e3d6e
commit 69b01a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73a99f083009d67d8e12603420e008d5c21b0b7d
+refs/heads/master: d6db3f5c11dc7ed5712d5d5682aa34025ee5248e
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
@@ -646,8 +646,9 @@ static int set_bit_to_user(int nr, void __user *addr)
 	int bit = nr + (log % PAGE_SIZE) * 8;
 	int r;
 	r = get_user_pages_fast(log, 1, 1, &page);
-	if (r)
+	if (r < 0)
 		return r;
+	BUG_ON(r != 1);
 	base = kmap_atomic(page, KM_USER0);
 	set_bit(bit, base);
 	kunmap_atomic(base, KM_USER0);