7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From f6ad72a5b215bc5b2d8df86cd537bf1c0f468108 Mon Sep 17 00:00:00 2001
|
|
From: zhangchujun <zhangchujun@cmss.chinamobile.com>
|
|
Date: Wed, 30 Oct 2024 13:33:58 +0800
|
|
Subject: [PATCH] Fix calculation of minimum in colo_compare_tcp
|
|
|
|
GitHub's CodeQL reports a critical error which is fixed by using the MIN macro:
|
|
|
|
Unsigned difference expression compared to zero
|
|
|
|
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
|
Signed-off-by: zhangchujun <zhangchujun_yewu@cmss.chinamobile.com>
|
|
---
|
|
net/colo-compare.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/net/colo-compare.c b/net/colo-compare.c
|
|
index 7f9e6f89ce..d4e51cb306 100644
|
|
--- a/net/colo-compare.c
|
|
+++ b/net/colo-compare.c
|
|
@@ -413,8 +413,7 @@ static void colo_compare_tcp(CompareState *s, Connection *conn)
|
|
* can ensure that the packet's payload is acknowledged by
|
|
* primary and secondary.
|
|
*/
|
|
- uint32_t min_ack = conn->pack - conn->sack > 0 ?
|
|
- conn->sack : conn->pack;
|
|
+ uint32_t min_ack = MIN(conn->pack, conn->sack);
|
|
|
|
pri:
|
|
if (g_queue_is_empty(&conn->primary_list)) {
|
|
--
|
|
2.41.0.windows.1
|
|
|