diff --git a/qemu.spec b/qemu.spec index 64a5755136b38967f0db4d649616a011cb9a1d3a..78fdcfcf6328d39fff91ee67da550f322a846c36 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 58 +Release: 59 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -308,6 +308,7 @@ Patch0295: bootp-check-bootp_input-buffer-size.patch Patch0296: upd6-check-udp6_input-buffer-size.patch Patch0297: tftp-check-tftp_input-buffer-size.patch Patch0298: tftp-introduce-a-header-structure.patch +Patch0299: virtio-balloon-apply-upstream-patch.patch BuildRequires: flex BuildRequires: bison @@ -705,6 +706,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Dec 03 2021 Chen Qun +- virtio-balloon: apply upstream patch. + * Tue Oct 19 2021 imxcc - fix cve-2021-3592 cve-2021-3593 cve-2021-3595 diff --git a/virtio-balloon-apply-upstream-patch.patch b/virtio-balloon-apply-upstream-patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..657bc5e74dc217fe9dd4d351068491d4a1f5a1bd --- /dev/null +++ b/virtio-balloon-apply-upstream-patch.patch @@ -0,0 +1,31 @@ +From 263b724854f4fb1166e3bf053d926273e519e936 Mon Sep 17 00:00:00 2001 +From: Ming Yang +Date: Tue, 16 Nov 2021 17:25:19 +0800 +Subject: [PATCH] virtio-balloon: apply upstream patch. + +Signed-off-by: Ming Yang +--- + hw/virtio/virtio-balloon.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c +index 25de154307..ae56c0d906 100644 +--- a/hw/virtio/virtio-balloon.c ++++ b/hw/virtio/virtio-balloon.c +@@ -830,6 +830,13 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp) + } + balloon_stats_destroy_timer(s); + qemu_remove_balloon_handler(s); ++ ++ virtio_del_queue(vdev, 0); ++ virtio_del_queue(vdev, 1); ++ virtio_del_queue(vdev, 2); ++ if (s->free_page_vq) { ++ virtio_del_queue(vdev, 3); ++ } + virtio_cleanup(vdev); + } + +-- +2.27.0 +