From bbbfc96bb98beed261b73b109edffb6d847256ae Mon Sep 17 00:00:00 2001 From: AlexChen Date: Tue, 15 Sep 2020 18:24:45 +0800 Subject: [PATCH] qemu: rename some patchs about slirp Signed-off-by: AlexChen --- qemu.spec | 15 +++++++++------ ....patch => slirp-drop-bogus-IPv6-messages.patch | 2 +- ...tch => slirp-ip_reass-Fix-use-after-free.patch | 0 ...ss.patch => slirp-tcp_emu-Fix-oob-access.patch | 0 ...slirp-tcp_emu-fix-unsafe-snprintf-usages.patch | 0 ...atch => slirp-util-add-slirp_fmt-helpers.patch | 0 6 files changed, 10 insertions(+), 7 deletions(-) rename Drop-bogus-IPv6-messages.patch => slirp-drop-bogus-IPv6-messages.patch (98%) rename ip_reass-Fix-use-after-free.patch => slirp-ip_reass-Fix-use-after-free.patch (100%) rename tcp_emu-Fix-oob-access.patch => slirp-tcp_emu-Fix-oob-access.patch (100%) rename tcp_emu-fix-unsafe-snprintf-usages.patch => slirp-tcp_emu-fix-unsafe-snprintf-usages.patch (100%) rename util-add-slirp_fmt-helpers.patch => slirp-util-add-slirp_fmt-helpers.patch (100%) diff --git a/qemu.spec b/qemu.spec index 0afa0c34..d84edcf2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 28 +Release: 29 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY @@ -40,11 +40,11 @@ Patch0027: nbd-fix-uninitialized-variable-warning.patch Patch0028: xhci-Fix-memory-leak-in-xhci_kick_epctx-when-poweroff.patch Patch0029: block-fix-memleaks-in-bdrv_refresh_filename.patch Patch0030: iscsi-Cap-block-count-from-GET-LBA-STATUS-CVE-2020-1.patch -Patch0031: tcp_emu-Fix-oob-access.patch +Patch0031: slirp-tcp_emu-Fix-oob-access.patch Patch0032: slirp-use-correct-size-while-emulating-IRC-commands.patch Patch0033: slirp-use-correct-size-while-emulating-commands.patch -Patch0034: util-add-slirp_fmt-helpers.patch -Patch0035: tcp_emu-fix-unsafe-snprintf-usages.patch +Patch0034: slirp-util-add-slirp_fmt-helpers.patch +Patch0035: slirp-tcp_emu-fix-unsafe-snprintf-usages.patch Patch0036: block-iscsi-use-MIN-between-mx_sb_len-and-sb_len_wr.patch Patch0037: monitor-fix-memory-leak-in-monitor_fdset_dup_fd_find.patch Patch0038: memory-Align-MemoryRegionSections-fields.patch @@ -165,7 +165,7 @@ Patch0152: arm-virt-Support-CPU-cold-plug.patch Patch0153: ide-Fix-incorrect-handling-of-some-PRDTs-in-ide_dma_.patch Patch0154: ati-vga-Fix-checks-in-ati_2d_blt-to-avoid-crash.patch Patch0155: slirp-tftp-restrict-relative-path-access.patch -Patch0156: ip_reass-Fix-use-after-free.patch +Patch0156: slirp-ip_reass-Fix-use-after-free.patch Patch0157: bt-use-size_t-type-for-length-parameters-instead-of-.patch Patch0158: log-Add-some-logs-on-VM-runtime-path.patch Patch0159: Revert-vtimer-compat-cross-version-migration-from-v4.patch @@ -279,7 +279,7 @@ Patch0266: migration-multifd-not-use-multifd-during-postcopy.patch Patch0267: migration-Define-VMSTATE_INSTANCE_ID_ANY.patch Patch0268: migration-Change-SaveStateEntry.instance_id-into-uin.patch Patch0269: apic-Use-32bit-APIC-ID-for-migration-instance-ID.patch -Patch0270: Drop-bogus-IPv6-messages.patch +Patch0270: slirp-drop-bogus-IPv6-messages.patch Patch0271: virtio-add-ability-to-delete-vq-through-a-pointer.patch Patch0272: virtio-pmem-do-delete-rq_vq-in-virtio_pmem_unrealize.patch Patch0273: virtio-crypto-do-delete-ctrl_vq-in-virtio_crypto_dev.patch @@ -635,6 +635,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Tue sep 15 2020 Huawei Technologies Co., Ltd +- qemu: rename some patchs of slirp + * Fri sep 11 2020 Huawei Technologies Co., Ltd - virtio: add ability to delete vq through a pointer - virtio-pmem: do delete rq_vq in virtio_pmem_unrealize diff --git a/Drop-bogus-IPv6-messages.patch b/slirp-drop-bogus-IPv6-messages.patch similarity index 98% rename from Drop-bogus-IPv6-messages.patch rename to slirp-drop-bogus-IPv6-messages.patch index 2fc1e0e7..7ddce8cd 100644 --- a/Drop-bogus-IPv6-messages.patch +++ b/slirp-drop-bogus-IPv6-messages.patch @@ -19,7 +19,7 @@ index d9d2b7e..c2dce52 100644 + // set in the payload length header. If not this is an invalid + // packet + if (m->m_len < ntohs(ip6->ip_pl) + sizeof(struct ip6)) { -+ goto bad; ++ goto bad; + } + /* check ip_ttl for a correct ICMP reply */ diff --git a/ip_reass-Fix-use-after-free.patch b/slirp-ip_reass-Fix-use-after-free.patch similarity index 100% rename from ip_reass-Fix-use-after-free.patch rename to slirp-ip_reass-Fix-use-after-free.patch diff --git a/tcp_emu-Fix-oob-access.patch b/slirp-tcp_emu-Fix-oob-access.patch similarity index 100% rename from tcp_emu-Fix-oob-access.patch rename to slirp-tcp_emu-Fix-oob-access.patch diff --git a/tcp_emu-fix-unsafe-snprintf-usages.patch b/slirp-tcp_emu-fix-unsafe-snprintf-usages.patch similarity index 100% rename from tcp_emu-fix-unsafe-snprintf-usages.patch rename to slirp-tcp_emu-fix-unsafe-snprintf-usages.patch diff --git a/util-add-slirp_fmt-helpers.patch b/slirp-util-add-slirp_fmt-helpers.patch similarity index 100% rename from util-add-slirp_fmt-helpers.patch rename to slirp-util-add-slirp_fmt-helpers.patch -- Gitee