瀏覽代碼

vhost: fix get_user_pages_fast error handling

get_user_pages_fast returns number of pages on success, negative value
on failure, but never 0. Fix vhost code to match this logic.

Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Michael S. Tsirkin 15 年之前
父節點
當前提交
d6db3f5c11
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/vhost/vhost.c

+ 2 - 1
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 bit = nr + (log % PAGE_SIZE) * 8;
 	int r;
 	int r;
 	r = get_user_pages_fast(log, 1, 1, &page);
 	r = get_user_pages_fast(log, 1, 1, &page);
-	if (r)
+	if (r < 0)
 		return r;
 		return r;
+	BUG_ON(r != 1);
 	base = kmap_atomic(page, KM_USER0);
 	base = kmap_atomic(page, KM_USER0);
 	set_bit(bit, base);
 	set_bit(bit, base);
 	kunmap_atomic(base, KM_USER0);
 	kunmap_atomic(base, KM_USER0);