diff --git a/[refs] b/[refs] index 5f285587bbb8..ccad25dd2fa4 100644 --- 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 index 6c31c0c9bbb9..7cd55e078794 100644 --- 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);