Commit cf7ea3bc authored by Jason Wang's avatar Jason Wang Committed by Xie XiuQi
Browse files

vhost_net: fix possible infinite loop 



hulk inclusion
category: bugfix
bugzilla: 13690
CVE: CVE-2019-3900

-------------------------------------------------

When the rx buffer is too small for a packet, we will discard the vq
descriptor and retry it for the next packet:

while ((sock_len = vhost_net_rx_peek_head_len(net, sock->sk,
					      &busyloop_intr))) {
...
	/* On overrun, truncate and discard */
	if (unlikely(headcount > UIO_MAXIOV)) {
		iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
		err = sock->ops->recvmsg(sock, &msg,
					 1, MSG_DONTWAIT | MSG_TRUNC);
		pr_debug("Discarded rx packet: len %zd\n", sock_len);
		continue;
	}
...
}

This makes it possible to trigger a infinite while..continue loop
through the co-opreation of two VMs like:

1) Malicious VM1 allocate 1 byte rx buffer and try to slow down the
   vhost process as much as possible e.g using indirect descriptors or
   other.
2) Malicious VM2 generate packets to VM1 as fast as possible

Fixing this by checking against weight at the end of RX and TX
loop. This also eliminate other similar cases when:

- userspace is consuming the packets in the meanwhile
- theoretical TOCTOU attack if guest moving avail index back and forth
  to hit the continue after vhost find guest just add new buffers

This addresses CVE-2019-3900.

Fixes: d8316f39 ("vhost: fix total length when packets are too short")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Conflicts:
  drivers/vhost/net.c
[yyl: adjust context]
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 550542b2

drivers/vhost/net.c

+21 −20
Original line number Diff line number Diff line
@@ -556,8 +556,9 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) 
	size_t len, total_len = 0;

	int err;

	int sent_pkts = 0;

	bool next_round = false;



	for (;;) {

	do {

		bool busyloop_intr = false;



		head = get_tx_bufs(net, nvq, &msg, &out, &in, &len,
@@ -598,11 +599,10 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) 
				 err, len);

		if (++nvq->done_idx >= VHOST_NET_BATCH)

			vhost_net_signal_used(nvq);

		if (vhost_exceeds_weight(++sent_pkts, total_len)) {

	} while (!(next_round = vhost_exceeds_weight(++sent_pkts, total_len)));



	if (next_round)

		vhost_poll_queue(&vq->poll);

			break;

		}

	}



	vhost_net_signal_used(nvq);

}
@@ -625,8 +625,9 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) 
	struct vhost_net_ubuf_ref *uninitialized_var(ubufs);

	bool zcopy_used;

	int sent_pkts = 0;

	bool next_round = false;



	for (;;) {

	do {

		bool busyloop_intr;



		/* Release DMAs done buffers first */
@@ -701,11 +702,10 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) 
		else

			vhost_zerocopy_signal_used(net, vq);

		vhost_net_tx_packet(net);

		if (unlikely(vhost_exceeds_weight(++sent_pkts, total_len))) {

	} while (!(next_round = vhost_exceeds_weight(++sent_pkts, total_len)));



	if (next_round)

		vhost_poll_queue(&vq->poll);

			break;

		}

	}

}



/* Expects to be always run from workqueue - which acts as
@@ -922,6 +922,7 @@ static void handle_rx(struct vhost_net *net) 
	struct iov_iter fixup;

	__virtio16 num_buffers;

	int recv_pkts = 0;

	bool next_round = false;



	mutex_lock_nested(&vq->mutex, 0);

	sock = vq->private_data;
@@ -941,8 +942,11 @@ static void handle_rx(struct vhost_net *net) 
		vq->log : NULL;

	mergeable = vhost_has_feature(vq, VIRTIO_NET_F_MRG_RXBUF);



	while ((sock_len = vhost_net_rx_peek_head_len(net, sock->sk,

						      &busyloop_intr))) {

	do {

		sock_len = vhost_net_rx_peek_head_len(net, sock->sk,

						      &busyloop_intr);

		if (!sock_len)

			break;

		sock_len += sock_hlen;

		vhost_len = sock_len + vhost_hlen;

		headcount = get_rx_bufs(vq, vq->heads + nvq->done_idx,
@@ -1027,12 +1031,9 @@ static void handle_rx(struct vhost_net *net) 
			vhost_log_write(vq, vq_log, log, vhost_len,

					vq->iov, in);

		total_len += vhost_len;

		if (unlikely(vhost_exceeds_weight(++recv_pkts, total_len))) {

			vhost_poll_queue(&vq->poll);

			goto out;

		}

	}

	if (unlikely(busyloop_intr))

	} while (!(next_round = vhost_exceeds_weight(++recv_pkts, total_len)));



	if (unlikely(busyloop_intr || next_round))

		vhost_poll_queue(&vq->poll);

	else

		vhost_net_enable_vq(net, vq);