diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/vhost | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 344019774ddd..b6f149572d1a 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
| @@ -418,7 +418,7 @@ static int log_access_ok(void __user *log_base, u64 addr, unsigned long sz) | |||
| 418 | /* Make sure 64 bit math will not overflow. */ | 418 | /* Make sure 64 bit math will not overflow. */ |
| 419 | if (a > ULONG_MAX - (unsigned long)log_base || | 419 | if (a > ULONG_MAX - (unsigned long)log_base || |
| 420 | a + (unsigned long)log_base > ULONG_MAX) | 420 | a + (unsigned long)log_base > ULONG_MAX) |
| 421 | return -EFAULT; | 421 | return 0; |
| 422 | 422 | ||
| 423 | return access_ok(VERIFY_WRITE, log_base + a, | 423 | return access_ok(VERIFY_WRITE, log_base + a, |
| 424 | (sz + VHOST_PAGE_SIZE * 8 - 1) / VHOST_PAGE_SIZE / 8); | 424 | (sz + VHOST_PAGE_SIZE * 8 - 1) / VHOST_PAGE_SIZE / 8); |