]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
Fix calculation of minimum in colo_compare_tcp
authorStefan Weil <sw@weilnetz.de>
Mon, 9 Sep 2024 20:42:54 +0000 (22:42 +0200)
committerJason Wang <jasowang@redhat.com>
Tue, 29 Oct 2024 07:53:23 +0000 (15:53 +0800)
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>
net/colo-compare.c

index c4ad0ab71fa25c3c677fdd804c0719e0a7b8f483..39f90c40652363fc9c1eff470b9e9e3c61abef82 100644 (file)
@@ -412,8 +412,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)) {