diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-27 12:53:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-26 17:13:17 -0700 |
| commit | 1bc0f3b76f86de85baa45a5e64cf5970095d2925 (patch) | |
| tree | aef0c4a5e425631bbd9db01439e5d11714a1577b | |
| parent | 20a51abb07a34a3af96b4fffac08022763f74c93 (diff) | |
| download | linux-stable-1bc0f3b76f86de85baa45a5e64cf5970095d2925.tar.gz linux-stable-1bc0f3b76f86de85baa45a5e64cf5970095d2925.tar.bz2 linux-stable-1bc0f3b76f86de85baa45a5e64cf5970095d2925.zip | |
vhost: validate vhost_get_vq_desc return value
[ Upstream commit a39ee449f96a2cd44ce056d8a0a112211a9b1a1f ]
vhost fails to validate negative error code
from vhost_get_vq_desc causing
a crash: we are using -EFAULT which is 0xfffffff2
as vector size, which exceeds the allocated size.
The code in question was introduced in commit
8dd014adfea6f173c1ef6378f7e5e7924866c923
vhost-net: mergeable buffers support
CVE-2014-0055
Signed-off-by: Michael S. Tsirkin <mst@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/net.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 2daab82b2253..3fd908c5c0cc 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -324,9 +324,13 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, r = -ENOBUFS; goto err; } - d = vhost_get_vq_desc(vq->dev, vq, vq->iov + seg, + r = vhost_get_vq_desc(vq->dev, vq, vq->iov + seg, ARRAY_SIZE(vq->iov) - seg, &out, &in, log, log_num); + if (unlikely(r < 0)) + goto err; + + d = r; if (d == vq->num) { r = 0; goto err; |