86bdfa9211
- sync some bugfix patches from upstream - fix the virtio features negotiation flaw - fix CVE-2022-4144 Signed-off-by: yezengruan <yezengruan@huawei.com>
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From b8c6b11e9651c5c94d3a66c64a9d54becb625a8e 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 20:03:56 +0800
|
|
Subject: [PATCH 10/17] vhost-user: Refactor the chr_closed_bh
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use vhost_user_save_acked_features to implemente acked features
|
|
saving.
|
|
|
|
Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
|
|
Signed-off-by: Guoyi Tu <tugy@chinatelecom.cn>
|
|
---
|
|
net/vhost-user.c | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/net/vhost-user.c b/net/vhost-user.c
|
|
index dca277db8c..e3680b769f 100644
|
|
--- a/net/vhost-user.c
|
|
+++ b/net/vhost-user.c
|
|
@@ -263,11 +263,7 @@ static void chr_closed_bh(void *opaque)
|
|
s = DO_UPCAST(NetVhostUserState, nc, ncs[0]);
|
|
|
|
for (i = queues -1; i >= 0; i--) {
|
|
- s = DO_UPCAST(NetVhostUserState, nc, ncs[i]);
|
|
-
|
|
- if (s->vhost_net) {
|
|
- s->acked_features = vhost_net_get_acked_features(s->vhost_net);
|
|
- }
|
|
+ vhost_user_save_acked_features(ncs[i]);
|
|
}
|
|
|
|
qmp_set_link(name, false, &err);
|
|
--
|
|
2.27.0
|
|
|