From: Stefan Weil <sw@weilnetz.de>
Date: Mon, 9 Sep 2024 20:42:54 +0000 (+0200)
Subject: Fix calculation of minimum in colo_compare_tcp
X-Git-Tag: v8.2.8~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01f9d3553dc9bd56b5ba420d380221626eff2a7c;p=thirdparty%2Fqemu.git

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>
(cherry picked from commit e29bc931e1699a98959680f6776b48673825762b)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 7f9e6f89ce0..d4e51cb306e 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)) {