86ffd40d11
- Switch method of splitting off hw-s390x-virtio-gpu-ccw.so as a module to what was accepted upstream (bsc#1181103) * Patches dropped: hw-s390x-modularize-virtio-gpu-ccw.patch * Patches added: s390x-add-have_virtio_ccw.patch s390x-modularize-virtio-gpu-ccw.patch s390x-move-S390_ADAPTER_SUPPRESSIBLE.patch - Fix OOB access in sdhci interface (CVE-2020-17380, bsc#1175144, CVE-2020-25085, bsc#1176681, CVE-2021-3409, bsc#1182282) hw-sd-sd-Actually-perform-the-erase-oper.patch hw-sd-sd-Fix-build-error-when-DEBUG_SD-i.patch hw-sd-sdhci-Correctly-set-the-controller.patch hw-sd-sdhci-Don-t-transfer-any-data-when.patch hw-sd-sdhci-Don-t-write-to-SDHC_SYSAD-re.patch hw-sd-sdhci-Limit-block-size-only-when-S.patch hw-sd-sdhci-Reset-the-data-pointer-of-s-.patch hw-sd-sd-Move-the-sd_block_-read-write-a.patch hw-sd-sd-Skip-write-protect-groups-check.patch - Fix potential privilege escalation in virtiofsd tool (CVE-2021-20263, bsc#1183373) tools-virtiofsd-Replace-the-word-whiteli.patch viriofsd-Add-support-for-FUSE_HANDLE_KIL.patch virtiofsd-extract-lo_do_open-from-lo_ope.patch virtiofsd-optionally-return-inode-pointe.patch virtiofsd-prevent-opening-of-special-fil.patch virtiofs-drop-remapped-security.capabili.patch virtiofsd-Save-error-code-early-at-the-f.patch - Fix OOB access (stack overflow) in rtl8139 NIC emulation (CVE-2021-3416, bsc#1182968) net-introduce-qemu_receive_packet.patch rtl8139-switch-to-use-qemu_receive_packe.patch - Fix OOB access (stack overflow) in other NIC emulations (CVE-2021-3416) cadence_gem-switch-to-use-qemu_receive_p.patch dp8393x-switch-to-use-qemu_receive_packe.patch e1000-switch-to-use-qemu_receive_packet-.patch lan9118-switch-to-use-qemu_receive_packe.patch msf2-mac-switch-to-use-qemu_receive_pack.patch pcnet-switch-to-use-qemu_receive_packet-.patch sungem-switch-to-use-qemu_receive_packet.patch tx_pkt-switch-to-use-qemu_receive_packet.patch - Fix heap overflow in MSIx emulation (CVE-2020-27821, bsc#1179686) memory-clamp-cached-translation-in-case-.patch - Include upstream patches designated as stable material and reviewed for applicability to include here hw-arm-virt-Disable-pl011-clock-migratio.patch xen-block-Fix-removal-of-backend-instanc.patch - Fix package scripts to not use hard coded paths for temporary working directories and log files (bsc#1182425) OBS-URL: https://build.opensuse.org/request/show/882222 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=632
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Wed, 17 Mar 2021 10:56:21 +0100
|
|
Subject: s390x: add have_virtio_ccw
|
|
|
|
Git-commit: 2dd9d8cfb4f3bd30d9cdfc2edba5cb7ee5917f4b
|
|
References: bsc#1181103
|
|
|
|
Introduce a symbol which can be used to prevent ccw modules
|
|
being loaded into system emulators without ccw support.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
|
|
Tested-by: Halil Pasic <pasic@linux.ibm.com>
|
|
Message-Id: <20210317095622.2839895-3-kraxel@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/s390x/virtio-ccw.c | 2 ++
|
|
hw/s390x/virtio-ccw.h | 5 +++++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
|
|
index 4582e94ae7dc4d75117ffc201047..82ec2889b0c7ce64bb96b9c67212 100644
|
|
--- a/hw/s390x/virtio-ccw.c
|
|
+++ b/hw/s390x/virtio-ccw.c
|
|
@@ -35,6 +35,8 @@
|
|
|
|
#define NR_CLASSIC_INDICATOR_BITS 64
|
|
|
|
+bool have_virtio_ccw = true;
|
|
+
|
|
static int virtio_ccw_dev_post_load(void *opaque, int version_id)
|
|
{
|
|
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(opaque);
|
|
diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
|
|
index 49a2b8ca42df799f1815f8af32d1..0168232e3b8db1da2a91dfd157db 100644
|
|
--- a/hw/s390x/virtio-ccw.h
|
|
+++ b/hw/s390x/virtio-ccw.h
|
|
@@ -63,6 +63,11 @@ typedef struct VirtioBusClass VirtioCcwBusClass;
|
|
DECLARE_OBJ_CHECKERS(VirtioCcwBusState, VirtioCcwBusClass,
|
|
VIRTIO_CCW_BUS, TYPE_VIRTIO_CCW_BUS)
|
|
|
|
+/*
|
|
+ * modules can reference this symbol to avoid being loaded
|
|
+ * into system emulators without ccw support
|
|
+ */
|
|
+extern bool have_virtio_ccw;
|
|
|
|
struct VirtIOCCWDeviceClass {
|
|
CCWDeviceClass parent_class;
|