mirror of
https://github.com/torvalds/linux.git
synced 2025-01-01 15:51:46 +00:00
vhost: validate vhost_get_vq_desc return value
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
8dd014adfe
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>
This commit is contained in:
parent
d8316f3991
commit
a39ee449f9
@ -505,9 +505,13 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
|
|||||||
r = -ENOBUFS;
|
r = -ENOBUFS;
|
||||||
goto err;
|
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,
|
ARRAY_SIZE(vq->iov) - seg, &out,
|
||||||
&in, log, log_num);
|
&in, log, log_num);
|
||||||
|
if (unlikely(r < 0))
|
||||||
|
goto err;
|
||||||
|
|
||||||
|
d = r;
|
||||||
if (d == vq->num) {
|
if (d == vq->num) {
|
||||||
r = 0;
|
r = 0;
|
||||||
goto err;
|
goto err;
|
||||||
|
Loading…
Reference in New Issue
Block a user