diff options
author | Jason Wang <jasowang@redhat.com> | 2019-02-19 14:53:44 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-23 09:06:43 +0100 |
commit | d5a74d2b466b7d6595b8e28db64fb66f7fd5e724 (patch) | |
tree | f7461b1733837ac579ec6fa2083ebc6ef70c32b4 | |
parent | 546b8f668e91baa55cd47ddeaeef607e75369043 (diff) | |
download | linux-stable-d5a74d2b466b7d6595b8e28db64fb66f7fd5e724.tar.gz linux-stable-d5a74d2b466b7d6595b8e28db64fb66f7fd5e724.tar.bz2 linux-stable-d5a74d2b466b7d6595b8e28db64fb66f7fd5e724.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 37fcb3ca89f1..d7c22ae5c368 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -1776,7 +1776,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++) { |