diff options
| author | Jason Wang | 2019-02-19 07:53:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-02-23 09:07:25 +0100 |
| commit | 9a752d37292bb377d3f7eb7755d78883fad5c439 (patch) | |
| tree | ee9d5eea467ad941c14eac64db62905d95b1e51e /drivers/vhost | |
| parent | sky2: Increase D3 delay again (diff) | |
| download | kernel-qcow2-linux-9a752d37292bb377d3f7eb7755d78883fad5c439.tar.gz kernel-qcow2-linux-9a752d37292bb377d3f7eb7755d78883fad5c439.tar.xz kernel-qcow2-linux-9a752d37292bb377d3f7eb7755d78883fad5c439.zip | |
vhost: correctly check the return value of translate_desc() in log_used()
[ Upstream commit 816db7663565cd23f74ed3d5c9240522e3fb0dda ]
When fail, translate_desc() returns negative value, otherwise the
number of iovs. So we should fail when the return value is negative
instead of a blindly check against zero.
Detected by CoverityScan, CID# 1442593: Control flow issues (DEADCODE)
Fixes: cc5e71075947 ("vhost: log dirty page correctly")
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
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 cf82e7266397..5eaeca805c95 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1784,7 +1784,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++) { |