diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-20 00:34:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-20 00:34:07 -0800 |
| commit | 375ca548f7e3ac82acdd0959eddd1fa0e17c35cc (patch) | |
| tree | 5360dc427e4eff7123613419ee522b7fda831de0 /drivers/vhost/vhost.c | |
| parent | 58066ac9d7f5dcde4ef08c03b7e127f0522d9ea0 (diff) | |
| parent | 40e196a906d969fd10d885c692d2674b3d657006 (diff) | |
| download | linux-375ca548f7e3ac82acdd0959eddd1fa0e17c35cc.tar.gz linux-375ca548f7e3ac82acdd0959eddd1fa0e17c35cc.tar.bz2 linux-375ca548f7e3ac82acdd0959eddd1fa0e17c35cc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost/vhost.c')
| -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 24a129fcdd61..a2e5dc7716e2 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1788,7 +1788,7 @@ static int log_used(struct vhost_virtqueue *vq, u64 used_offset, u64 len) ret = translate_desc(vq, (uintptr_t)vq->used + used_offset, len, iov, 64, VHOST_ACCESS_WO); - if (ret) + if (ret < 0) return ret; for (i = 0; i < ret; i++) { |