86bdfa9211
- sync some bugfix patches from upstream - fix the virtio features negotiation flaw - fix CVE-2022-4144 Signed-off-by: yezengruan <yezengruan@huawei.com>
93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
From d29a94eff93b12790fe96c40412854c4cff843d2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
|
|
<huangy81@chinatelecom.cn>
|
|
Date: Fri, 11 Nov 2022 19:33:26 +0800
|
|
Subject: [PATCH 11/17] vhost-user: Fix the virtio features negotiation flaw
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This patch aims to fix unexpected negotiation features for
|
|
vhost-user netdev interface.
|
|
|
|
When openvswitch reconnect Qemu after an unexpected disconnection
|
|
and Qemu therefore start the vhost_dev, acked_features field in
|
|
vhost_dev is initialized with value fetched from acked_features
|
|
field in NetVhostUserState, which should be up-to-date at that
|
|
moment but Qemu could not make it actually during the time window
|
|
of virtio features negotiation.
|
|
|
|
So we save the acked_features right after being configured by
|
|
guest virtio driver so it can be used to restore acked_features
|
|
field in vhost_dev correctly.
|
|
|
|
Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
|
|
Signed-off-by: Guoyi Tu <tugy@chinatelecom.cn>
|
|
---
|
|
hw/net/vhost_net-stub.c | 5 +++++
|
|
hw/net/vhost_net.c | 6 ++++++
|
|
hw/net/virtio-net.c | 6 ++++++
|
|
include/net/vhost_net.h | 1 +
|
|
4 files changed, 18 insertions(+)
|
|
|
|
diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c
|
|
index 89d71cfb8e..199b09952a 100644
|
|
--- a/hw/net/vhost_net-stub.c
|
|
+++ b/hw/net/vhost_net-stub.c
|
|
@@ -101,3 +101,8 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu)
|
|
{
|
|
return 0;
|
|
}
|
|
+
|
|
+void vhost_net_save_acked_features(NetClientState *nc)
|
|
+{
|
|
+
|
|
+}
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
|
index 1911ffd7ed..a98575ffbc 100644
|
|
--- a/hw/net/vhost_net.c
|
|
+++ b/hw/net/vhost_net.c
|
|
@@ -141,6 +141,12 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net)
|
|
return net->dev.acked_features;
|
|
}
|
|
|
|
+void vhost_net_save_acked_features(NetClientState *nc)
|
|
+{
|
|
+ assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_USER);
|
|
+ vhost_user_save_acked_features(nc);
|
|
+}
|
|
+
|
|
static int vhost_net_get_fd(NetClientState *backend)
|
|
{
|
|
switch (backend->info->type) {
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 918a7aba89..4946b65e22 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -935,6 +935,12 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
|
|
continue;
|
|
}
|
|
vhost_net_ack_features(get_vhost_net(nc->peer), features);
|
|
+
|
|
+ /*
|
|
+ * keep acked_features in NetVhostUserState up-to-date so it
|
|
+ * can't miss any features configured by guest virtio driver.
|
|
+ */
|
|
+ vhost_net_save_acked_features(nc->peer);
|
|
}
|
|
|
|
if (virtio_has_feature(features, VIRTIO_NET_F_CTRL_VLAN)) {
|
|
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
|
|
index 387e913e4e..7bdbf484e4 100644
|
|
--- a/include/net/vhost_net.h
|
|
+++ b/include/net/vhost_net.h
|
|
@@ -48,4 +48,5 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net);
|
|
|
|
int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);
|
|
|
|
+void vhost_net_save_acked_features(NetClientState *nc);
|
|
#endif
|
|
--
|
|
2.27.0
|
|
|