git: 398bfe63e6f7 - stable/12 - bhyve: Fix vq_getchain() error handling bugs in various device models
Mark Johnston
markj at FreeBSD.org
Tue Aug 24 18:32:27 UTC 2021
The branch stable/12 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=398bfe63e6f7d265c6bae2f56da29d37f6fc7a01
commit 398bfe63e6f7d265c6bae2f56da29d37f6fc7a01
Author: Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-08-24 18:13:00 +0000
Commit: Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-08-24 18:30:15 +0000
bhyve: Fix vq_getchain() error handling bugs in various device models
Reviewed by: grehan, khng
Approved by: so
Security: CVE-2021-29631
Security: FreeBSD-SA-21:13.bhyve
(cherry picked from commit 71fbc6faed62e8eb5864f7c40839740f5e9f5558)
---
usr.sbin/bhyve/pci_virtio_console.c | 7 ++++---
usr.sbin/bhyve/pci_virtio_rnd.c | 5 +++--
usr.sbin/bhyve/pci_virtio_scsi.c | 10 ++++++----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c
index baec5534142a..d0567fe964a8 100644
--- a/usr.sbin/bhyve/pci_virtio_console.c
+++ b/usr.sbin/bhyve/pci_virtio_console.c
@@ -418,6 +418,7 @@ pci_vtcon_sock_rx(int fd __unused, enum ev_type t __unused, void *arg)
do {
n = vq_getchain(vq, &idx, &iov, 1, NULL);
+ assert(n == 1);
len = readv(sock->vss_conn_fd, &iov, n);
if (len == 0 || (len < 0 && errno == EWOULDBLOCK)) {
@@ -558,7 +559,6 @@ pci_vtcon_control_send(struct pci_vtcon_softc *sc,
return;
n = vq_getchain(vq, &idx, &iov, 1, NULL);
-
assert(n == 1);
memcpy(iov.iov_base, ctrl, sizeof(struct pci_vtcon_control));
@@ -577,7 +577,8 @@ pci_vtcon_notify_tx(void *vsc, struct vqueue_info *vq)
struct pci_vtcon_softc *sc;
struct pci_vtcon_port *port;
struct iovec iov[1];
- uint16_t idx, n;
+ int n;
+ uint16_t idx;
uint16_t flags[8];
sc = vsc;
@@ -585,7 +586,7 @@ pci_vtcon_notify_tx(void *vsc, struct vqueue_info *vq)
while (vq_has_descs(vq)) {
n = vq_getchain(vq, &idx, iov, 1, flags);
- assert(n >= 1);
+ assert(n == 1);
if (port != NULL)
port->vsp_cb(port, port->vsp_arg, iov, 1);
diff --git a/usr.sbin/bhyve/pci_virtio_rnd.c b/usr.sbin/bhyve/pci_virtio_rnd.c
index 4f908324cfa9..738bab7f6d48 100644
--- a/usr.sbin/bhyve/pci_virtio_rnd.c
+++ b/usr.sbin/bhyve/pci_virtio_rnd.c
@@ -113,7 +113,7 @@ pci_vtrnd_notify(void *vsc, struct vqueue_info *vq)
{
struct iovec iov;
struct pci_vtrnd_softc *sc;
- int len;
+ int len, n;
uint16_t idx;
sc = vsc;
@@ -124,7 +124,8 @@ pci_vtrnd_notify(void *vsc, struct vqueue_info *vq)
}
while (vq_has_descs(vq)) {
- vq_getchain(vq, &idx, &iov, 1, NULL);
+ n = vq_getchain(vq, &idx, &iov, 1, NULL);
+ assert(n == 1);
len = read(sc->vrsc_fd, iov.iov_base, iov.iov_len);
diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c
index 04c5302f501f..0c2342134b3d 100644
--- a/usr.sbin/bhyve/pci_virtio_scsi.c
+++ b/usr.sbin/bhyve/pci_virtio_scsi.c
@@ -556,15 +556,16 @@ pci_vtscsi_controlq_notify(void *vsc, struct vqueue_info *vq)
{
struct pci_vtscsi_softc *sc;
struct iovec iov[VTSCSI_MAXSEG];
- uint16_t idx, n;
+ uint16_t idx;
void *buf = NULL;
size_t bufsize;
- int iolen;
+ int iolen, n;
sc = vsc;
while (vq_has_descs(vq)) {
n = vq_getchain(vq, &idx, iov, VTSCSI_MAXSEG, NULL);
+ assert(n >= 1 && n <= VTSCSI_MAXSEG);
bufsize = iov_to_buf(iov, n, &buf);
iolen = pci_vtscsi_control_handle(sc, buf, bufsize);
buf_to_iov(buf + bufsize - iolen, iolen, iov, n,
@@ -594,8 +595,8 @@ pci_vtscsi_requestq_notify(void *vsc, struct vqueue_info *vq)
struct pci_vtscsi_request *req;
struct iovec iov[VTSCSI_MAXSEG];
uint16_t flags[VTSCSI_MAXSEG];
- uint16_t idx, n, i;
- int readable;
+ uint16_t idx, i;
+ int readable, n;
sc = vsc;
q = &sc->vss_queues[vq->vq_num - 2];
@@ -603,6 +604,7 @@ pci_vtscsi_requestq_notify(void *vsc, struct vqueue_info *vq)
while (vq_has_descs(vq)) {
readable = 0;
n = vq_getchain(vq, &idx, iov, VTSCSI_MAXSEG, flags);
+ assert(n >= 1 && n <= VTSCSI_MAXSEG);
/* Count readable descriptors */
for (i = 0; i < n; i++) {
More information about the dev-commits-src-all
mailing list