diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-02-23 11:25:23 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-02-28 19:42:36 +0200 |
| commit | d6db3f5c11dc7ed5712d5d5682aa34025ee5248e (patch) | |
| tree | 30d7c7dd5987be4185943de23db686027e1a0867 /drivers/vhost | |
| parent | 73a99f083009d67d8e12603420e008d5c21b0b7d (diff) | |
| download | op-kernel-dev-d6db3f5c11dc7ed5712d5d5682aa34025ee5248e.zip op-kernel-dev-d6db3f5c11dc7ed5712d5d5682aa34025ee5248e.tar.gz | |
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>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 6c31c0c..7cd55e0 100644 --- a/drivers/vhost/vhost.c +++ b/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); |
